Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev

2012-10-09 17:25:27 -07:00
parent 59a9603664 9e6e8355f8
commit 6f2cdcdbe4
1 changed files with 1 additions and 1 deletions
--- 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);
        }
    }