diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-09 17:25:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 17:25:27 -0700 |
| commit | 6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1 (patch) | |
| tree | 159d1ba58b0931fe7f44db97a11afcefac8015b2 /services | |
| parent | 59a960366424a354c7ddbca9a8d6008886ca2a77 (diff) | |
| parent | 9e6e8355f8d7bd1856e69cb8965087a00f1792bd (diff) | |
| download | frameworks_base-6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1.zip frameworks_base-6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1.tar.gz frameworks_base-6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1.tar.bz2 | |
Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WiredAccessoryManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/WiredAccessoryManager.java b/services/java/com/android/server/WiredAccessoryManager.java index 63e8895..d5c9c8f 100644 --- a/services/java/com/android/server/WiredAccessoryManager.java +++ b/services/java/com/android/server/WiredAccessoryManager.java @@ -152,7 +152,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { break; } - updateLocked(NAME_H2W, headset); + updateLocked(NAME_H2W, (mHeadsetState & ~(BIT_HEADSET | BIT_HEADSET_NO_MIC)) | headset); } } |