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

am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair

Browse Source 
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp

* commit '132dab8f91f5e87581660069753f238ea9914732':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
This commit is contained in:
Eric Laurent
2009-11-23 11:21:01 -08:00
committed by Android Git Automerger
parent 1f0a0ed549 132dab8f91
commit 6ed9c32c04
1 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,8 @@ class HeadsetObserver extends UEventObserver {
private static final int BIT_HEADSET = (1 << 0); private static final int BIT_HEADSET = (1 << 0);
private static final int BIT_HEADSET_NO_MIC = (1 << 1); private static final int BIT_HEADSET_NO_MIC = (1 << 1);
private static final int SUPPORTED_HEADSETS = (BIT_HEADSET|BIT_HEADSET_NO_MIC);
private static final int HEADSETS_WITH_MIC = BIT_HEADSET;
private int mHeadsetState; private int mHeadsetState;
private int mPrevHeadsetState; private int mPrevHeadsetState;
@@ -100,68 +102,76 @@ class HeadsetObserver extends UEventObserver {
private synchronized final void update(String newName, int newState) { private synchronized final void update(String newName, int newState) {
// Retain only relevant bits // Retain only relevant bits
int headsetState = newState & (BIT_HEADSET|BIT_HEADSET_NO_MIC); int headsetState = newState & SUPPORTED_HEADSETS;
int newOrOld = headsetState | mHeadsetState;
// reject all suspect transitions: only accept state changes from:
// - a: 0 heaset to 1 headset
// - b: 1 headset to 0 headset
if (mHeadsetState == headsetState || ((newOrOld & (newOrOld - 1)) != 0)) {
return;
}
if (headsetState != mHeadsetState) { mHeadsetName = newName;
boolean isUnplug = false; mPrevHeadsetState = mHeadsetState;
if (((mHeadsetState & BIT_HEADSET) != 0 && (headsetState & BIT_HEADSET) == 0) || mHeadsetState = headsetState;
((mHeadsetState & BIT_HEADSET_NO_MIC) != 0 && (headsetState & BIT_HEADSET_NO_MIC) == 0)) { mPendingIntent = true;
isUnplug = true;
}
mHeadsetName = newName;
mPrevHeadsetState = mHeadsetState;
mHeadsetState = headsetState;
mPendingIntent = true;
if (isUnplug) { if (headsetState == 0) {
Intent intent = new Intent(AudioManager.ACTION_AUDIO_BECOMING_NOISY); Intent intent = new Intent(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
mContext.sendBroadcast(intent); mContext.sendBroadcast(intent);
// It can take hundreds of ms flush the audio pipeline after // It can take hundreds of ms flush the audio pipeline after
// apps pause audio playback, but audio route changes are // apps pause audio playback, but audio route changes are
// immediate, so delay the route change by 1000ms. // immediate, so delay the route change by 1000ms.
// This could be improved once the audio sub-system provides an // This could be improved once the audio sub-system provides an
// interface to clear the audio pipeline. // interface to clear the audio pipeline.
mWakeLock.acquire(); mWakeLock.acquire();
mHandler.sendEmptyMessageDelayed(0, 1000); mHandler.sendEmptyMessageDelayed(0, 1000);
} else { } else {
sendIntent(); sendIntents();
mPendingIntent = false; mPendingIntent = false;
}
}
private synchronized final void sendIntents() {
int allHeadsets = SUPPORTED_HEADSETS;
for (int curHeadset = 1; allHeadsets != 0; curHeadset <<= 1) {
if ((curHeadset & allHeadsets) != 0) {
sendIntent(curHeadset);
allHeadsets &= ~curHeadset;
} }
} }
} }
private synchronized final void sendIntent() { private final void sendIntent(int headset) {
// Pack up the values and broadcast them to everyone if ((mHeadsetState & headset) != (mPrevHeadsetState & headset)) {
Intent intent = new Intent(Intent.ACTION_HEADSET_PLUG); // Pack up the values and broadcast them to everyone
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); Intent intent = new Intent(Intent.ACTION_HEADSET_PLUG);
int state = 0; intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
int microphone = 0; int state = 0;
int microphone = 0;
if ((mHeadsetState & BIT_HEADSET) != (mPrevHeadsetState & BIT_HEADSET)) { if ((headset & HEADSETS_WITH_MIC) != 0) {
microphone = 1; microphone = 1;
if ((mHeadsetState & BIT_HEADSET) != 0) { }
state = 1; if ((mHeadsetState & headset) != 0) {
}
} else if ((mHeadsetState & BIT_HEADSET_NO_MIC) != (mPrevHeadsetState & BIT_HEADSET_NO_MIC)) {
if ((mHeadsetState & BIT_HEADSET_NO_MIC) != 0) {
state = 1; state = 1;
} }
intent.putExtra("state", state);
intent.putExtra("name", mHeadsetName);
intent.putExtra("microphone", microphone);
if (LOG) Log.v(TAG, "Intent.ACTION_HEADSET_PLUG: state: "+state+" name: "+mHeadsetName+" mic: "+microphone);
// TODO: Should we require a permission?
ActivityManagerNative.broadcastStickyIntent(intent, null);
} }
intent.putExtra("state", state);
intent.putExtra("name", mHeadsetName);
intent.putExtra("microphone", microphone);
// TODO: Should we require a permission?
ActivityManagerNative.broadcastStickyIntent(intent, null);
} }
private final Handler mHandler = new Handler() { private final Handler mHandler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
if (mPendingIntent) { if (mPendingIntent) {
sendIntent(); sendIntents();
mPendingIntent = false; mPendingIntent = false;
} }
mWakeLock.release(); mWakeLock.release();