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

Fix of compatibility with multifunction extUSB adapters.

Browse Source 
Tested with HTC YC A300.
This commit is contained in:
David Strobach
2009-05-20 03:30:50 +02:00
committed by Jean-Baptiste Queru
parent be8e36e32b
commit fb0bd47d3a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/HeadsetObserver.java
View File

@@ -97,7 +97,7 @@ class HeadsetObserver extends UEventObserver {
private synchronized final void update(String newName, int newState) {
if (newName != mHeadsetName || newState != mHeadsetState) {
boolean isUnplug = (newState == 0 && mHeadsetState == 1);
boolean isUnplug = (newState == 0 && mHeadsetState > 0);
mHeadsetName = newName;
mHeadsetState = newState;
mAudioRouteNeedsUpdate = true;
@@ -123,7 +123,7 @@ class HeadsetObserver extends UEventObserver {
Intent intent = new Intent(Intent.ACTION_HEADSET_PLUG);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
intent.putExtra("state", mHeadsetState);
intent.putExtra("state", isUnplug ? 0 : 1);
intent.putExtra("name", mHeadsetName);
// TODO: Should we require a permission?
@@ -137,7 +137,7 @@ class HeadsetObserver extends UEventObserver {
private synchronized final void updateAudioRoute() {
if (mAudioRouteNeedsUpdate) {
mAudioManager.setWiredHeadsetOn(mHeadsetState == 1);
mAudioManager.setWiredHeadsetOn(mHeadsetState > 0);
mAudioRouteNeedsUpdate = false;
}
}