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

Merge "Fix 5243349 RemoteControlDisplay incorrectly updated"

Browse Source
This commit is contained in:
Jean-Michel Trivi
2011-08-31 19:02:59 -07:00
committed by Android (Google) Code Review
parent 185a251b08 b716f0b7b2
commit a6ec356d2f
1 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
media/java/android/media/AudioService.java
View File

@@ -2638,7 +2638,7 @@ public class AudioService extends IAudioService.Stub {
notifyTopOfAudioFocusStack(); notifyTopOfAudioFocusStack();
// there's a new top of the stack, let the remote control know // there's a new top of the stack, let the remote control know
synchronized(mRCStack) { synchronized(mRCStack) {
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} else { } else {
@@ -2681,7 +2681,7 @@ public class AudioService extends IAudioService.Stub {
notifyTopOfAudioFocusStack(); notifyTopOfAudioFocusStack();
// there's a new top of the stack, let the remote control know // there's a new top of the stack, let the remote control know
synchronized(mRCStack) { synchronized(mRCStack) {
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} }
@@ -2785,7 +2785,7 @@ public class AudioService extends IAudioService.Stub {
// there's a new top of the stack, let the remote control know // there's a new top of the stack, let the remote control know
synchronized(mRCStack) { synchronized(mRCStack) {
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
}//synchronized(mAudioFocusLock) }//synchronized(mAudioFocusLock)
@@ -3183,7 +3183,7 @@ public class AudioService extends IAudioService.Stub {
* Helper function: * Helper function:
* Called synchronized on mRCStack * Called synchronized on mRCStack
*/ */
private void clearRemoteControlDisplay_syncRcs() { private void clearRemoteControlDisplay_syncAfRcs() {
synchronized(mCurrentRcLock) { synchronized(mCurrentRcLock) {
mCurrentRcClient = null; mCurrentRcClient = null;
} }
@@ -3192,18 +3192,21 @@ public class AudioService extends IAudioService.Stub {
} }
/** /**
* Helper function: * Helper function for code readability: only to be called from
* Called synchronized on mRCStack * checkUpdateRemoteControlDisplay_syncAfRcs() which checks the preconditions for
* mRCStack.isEmpty() is false * this method.
* Preconditions:
* - called synchronized mAudioFocusLock then on mRCStack
* - mRCStack.isEmpty() is false
*/ */
private void updateRemoteControlDisplay_syncRcs(int infoChangedFlags) { private void updateRemoteControlDisplay_syncAfRcs(int infoChangedFlags) {
RemoteControlStackEntry rcse = mRCStack.peek(); RemoteControlStackEntry rcse = mRCStack.peek();
int infoFlagsAboutToBeUsed = infoChangedFlags; int infoFlagsAboutToBeUsed = infoChangedFlags;
// this is where we enforce opt-in for information display on the remote controls // this is where we enforce opt-in for information display on the remote controls
// with the new AudioManager.registerRemoteControlClient() API // with the new AudioManager.registerRemoteControlClient() API
if (rcse.mRcClient == null) { if (rcse.mRcClient == null) {
//Log.w(TAG, "Can't update remote control display with null remote control client"); //Log.w(TAG, "Can't update remote control display with null remote control client");
clearRemoteControlDisplay_syncRcs(); clearRemoteControlDisplay_syncAfRcs();
return; return;
} }
synchronized(mCurrentRcLock) { synchronized(mCurrentRcLock) {
@@ -3220,17 +3223,17 @@ public class AudioService extends IAudioService.Stub {
/** /**
* Helper function: * Helper function:
* Called synchronized on mFocusLock, then mRCStack * Called synchronized on mAudioFocusLock, then mRCStack
* Check whether the remote control display should be updated, triggers the update if required * Check whether the remote control display should be updated, triggers the update if required
* @param infoChangedFlags the flags corresponding to the remote control client information * @param infoChangedFlags the flags corresponding to the remote control client information
* that has changed, if applicable (checking for the update conditions might trigger a * that has changed, if applicable (checking for the update conditions might trigger a
* clear, rather than an update event). * clear, rather than an update event).
*/ */
private void checkUpdateRemoteControlDisplay_syncRcs(int infoChangedFlags) { private void checkUpdateRemoteControlDisplay_syncAfRcs(int infoChangedFlags) {
// determine whether the remote control display should be refreshed // determine whether the remote control display should be refreshed
// if either stack is empty, there is a mismatch, so clear the RC display // if either stack is empty, there is a mismatch, so clear the RC display
if (mRCStack.isEmpty() || mFocusStack.isEmpty()) { if (mRCStack.isEmpty() || mFocusStack.isEmpty()) {
clearRemoteControlDisplay_syncRcs(); clearRemoteControlDisplay_syncAfRcs();
return; return;
} }
// if the top of the two stacks belong to different packages, there is a mismatch, clear // if the top of the two stacks belong to different packages, there is a mismatch, clear
@@ -3238,18 +3241,18 @@ public class AudioService extends IAudioService.Stub {
&& (mFocusStack.peek().mPackageName != null) && (mFocusStack.peek().mPackageName != null)
&& !(mRCStack.peek().mCallingPackageName.compareTo( && !(mRCStack.peek().mCallingPackageName.compareTo(
mFocusStack.peek().mPackageName) == 0)) { mFocusStack.peek().mPackageName) == 0)) {
clearRemoteControlDisplay_syncRcs(); clearRemoteControlDisplay_syncAfRcs();
return; return;
} }
// if the audio focus didn't originate from the same Uid as the one in which the remote // if the audio focus didn't originate from the same Uid as the one in which the remote
// control information will be retrieved, clear // control information will be retrieved, clear
if (mRCStack.peek().mCallingUid != mFocusStack.peek().mCallingUid) { if (mRCStack.peek().mCallingUid != mFocusStack.peek().mCallingUid) {
clearRemoteControlDisplay_syncRcs(); clearRemoteControlDisplay_syncAfRcs();
return; return;
} }
// refresh conditions were verified: update the remote controls // refresh conditions were verified: update the remote controls
// ok to call, mRCStack is not empty // ok to call: synchronized mAudioFocusLock then on mRCStack, mRCStack is not empty
updateRemoteControlDisplay_syncRcs(infoChangedFlags); updateRemoteControlDisplay_syncAfRcs(infoChangedFlags);
} }
/** see AudioManager.registerMediaButtonEventReceiver(ComponentName eventReceiver) */ /** see AudioManager.registerMediaButtonEventReceiver(ComponentName eventReceiver) */
@@ -3260,7 +3263,7 @@ public class AudioService extends IAudioService.Stub {
synchronized(mRCStack) { synchronized(mRCStack) {
pushMediaButtonReceiver(eventReceiver); pushMediaButtonReceiver(eventReceiver);
// new RC client, assume every type of information shall be queried // new RC client, assume every type of information shall be queried
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} }
@@ -3275,7 +3278,7 @@ public class AudioService extends IAudioService.Stub {
removeMediaButtonReceiver(eventReceiver); removeMediaButtonReceiver(eventReceiver);
if (topOfStackWillChange) { if (topOfStackWillChange) {
// current RC client will change, assume every type of info needs to be queried // current RC client will change, assume every type of info needs to be queried
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} }
@@ -3284,6 +3287,7 @@ public class AudioService extends IAudioService.Stub {
/** see AudioManager.registerRemoteControlClient(ComponentName eventReceiver, ...) */ /** see AudioManager.registerRemoteControlClient(ComponentName eventReceiver, ...) */
public void registerRemoteControlClient(ComponentName eventReceiver, public void registerRemoteControlClient(ComponentName eventReceiver,
IRemoteControlClient rcClient, String clientName, String callingPackageName) { IRemoteControlClient rcClient, String clientName, String callingPackageName) {
if (DEBUG_RC) Log.i(TAG, "Register remote control client rcClient="+rcClient);
synchronized(mAudioFocusLock) { synchronized(mAudioFocusLock) {
synchronized(mRCStack) { synchronized(mRCStack) {
// store the new display information // store the new display information
@@ -3331,7 +3335,7 @@ public class AudioService extends IAudioService.Stub {
// if the eventReceiver is at the top of the stack // if the eventReceiver is at the top of the stack
// then check for potential refresh of the remote controls // then check for potential refresh of the remote controls
if (isCurrentRcController(eventReceiver)) { if (isCurrentRcController(eventReceiver)) {
checkUpdateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} }
@@ -3436,35 +3440,35 @@ public class AudioService extends IAudioService.Stub {
*/ */
public void registerRemoteControlDisplay(IRemoteControlDisplay rcd) { public void registerRemoteControlDisplay(IRemoteControlDisplay rcd) {
if (DEBUG_RC) Log.d(TAG, ">>> registerRemoteControlDisplay("+rcd+")"); if (DEBUG_RC) Log.d(TAG, ">>> registerRemoteControlDisplay("+rcd+")");
synchronized(mRCStack) { synchronized(mAudioFocusLock) {
if ((mRcDisplay == rcd) || (rcd == null)) { synchronized(mRCStack) {
return; if ((mRcDisplay == rcd) || (rcd == null)) {
} return;
// if we had a display before, stop monitoring its death }
rcDisplay_stopDeathMonitor_syncRcStack(); // if we had a display before, stop monitoring its death
mRcDisplay = rcd; rcDisplay_stopDeathMonitor_syncRcStack();
// new display, start monitoring its death mRcDisplay = rcd;
rcDisplay_startDeathMonitor_syncRcStack(); // new display, start monitoring its death
rcDisplay_startDeathMonitor_syncRcStack();
// let all the remote control clients there is a new display // let all the remote control clients there is a new display
// no need to unplug the previous because we only support one display // no need to unplug the previous because we only support one display
// and the clients don't track the death of the display // and the clients don't track the death of the display
Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator(); Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator();
while(stackIterator.hasNext()) { while(stackIterator.hasNext()) {
RemoteControlStackEntry rcse = stackIterator.next(); RemoteControlStackEntry rcse = stackIterator.next();
if(rcse.mRcClient != null) { if(rcse.mRcClient != null) {
try { try {
rcse.mRcClient.plugRemoteControlDisplay(mRcDisplay); rcse.mRcClient.plugRemoteControlDisplay(mRcDisplay);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Error connecting remote control display to client: " + e); Log.e(TAG, "Error connecting remote control display to client: " + e);
e.printStackTrace(); e.printStackTrace();
}
} }
} }
}
if (!mRCStack.isEmpty()) {
// we have a new display, of which all the clients are now aware: have it be updated // we have a new display, of which all the clients are now aware: have it be updated
updateRemoteControlDisplay_syncRcs(RC_INFO_ALL); checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);
} }
} }
} }