Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5dfd668e9fa09760e59293e18f433d917cf42b38':
  fix concurrent headset and HDMI connection
This commit is contained in:
Eric Laurent
2012-10-09 17:29:00 -07:00
committed by Android Git Automerger
parent bca3dc965a 5dfd668e9f
commit 6ee2d3c744
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/WiredAccessoryManager.java
View File

@@ -152,7 +152,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
break; break;
} }
updateLocked(NAME_H2W, headset); updateLocked(NAME_H2W, (mHeadsetState & ~(BIT_HEADSET | BIT_HEADSET_NO_MIC)) | headset);
} }
} }