am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev

* commit '5dfd668e9fa09760e59293e18f433d917cf42b38': fix concurrent headset and HDMI connection
2012-10-09 17:29:00 -07:00
parent bca3dc965a 5dfd668e9f
commit 6ee2d3c744
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);
        }
    }