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

Merge "Fix deadlock in AudioService"

Browse Source
This commit is contained in:
Jean-Michel Trivi
2011-08-24 19:22:52 -07:00
committed by Android (Google) Code Review
parent 9a10bf0386 3094d955b8
commit e9816475a6
1 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3072,7 +3072,7 @@ public class AudioService extends IAudioService.Stub {
/** /**
* Update the remote control displays with the new "focused" client generation * Update the remote control displays with the new "focused" client generation
*/ */
private void setNewRcClientOnDisplays_syncRcStack(int newClientGeneration, private void setNewRcClientOnDisplays_syncAfRcsCurrc(int newClientGeneration,
ComponentName newClientEventReceiver, boolean clearing) { ComponentName newClientEventReceiver, boolean clearing) {
// NOTE: Only one IRemoteControlDisplay supported in this implementation // NOTE: Only one IRemoteControlDisplay supported in this implementation
if (mRcDisplay != null) { if (mRcDisplay != null) {
@@ -3091,7 +3091,7 @@ public class AudioService extends IAudioService.Stub {
/** /**
* Update the remote control clients with the new "focused" client generation * Update the remote control clients with the new "focused" client generation
*/ */
private void setNewRcClientGenerationOnClients_syncRcStack(int newClientGeneration) { private void setNewRcClientGenerationOnClients_syncAfRcsCurrc(int newClientGeneration) {
Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator(); Iterator<RemoteControlStackEntry> stackIterator = mRCStack.iterator();
while(stackIterator.hasNext()) { while(stackIterator.hasNext()) {
RemoteControlStackEntry se = stackIterator.next(); RemoteControlStackEntry se = stackIterator.next();
@@ -3115,15 +3115,13 @@ public class AudioService extends IAudioService.Stub {
* @param clearing true if the new client generation value maps to a remote control update * @param clearing true if the new client generation value maps to a remote control update
* where the display should be cleared. * where the display should be cleared.
*/ */
private void setNewRcClient(int newClientGeneration, ComponentName newClientEventReceiver, private void setNewRcClient_syncAfRcsCurrc(int newClientGeneration,
boolean clearing) { ComponentName newClientEventReceiver, boolean clearing) {
synchronized(mRCStack) { // send the new valid client generation ID to all displays
// send the new valid client generation ID to all displays setNewRcClientOnDisplays_syncAfRcsCurrc(newClientGeneration, newClientEventReceiver,
setNewRcClientOnDisplays_syncRcStack(newClientGeneration, newClientEventReceiver, clearing);
clearing); // send the new valid client generation ID to all clients
// send the new valid client generation ID to all clients setNewRcClientGenerationOnClients_syncAfRcsCurrc(newClientGeneration);
setNewRcClientGenerationOnClients_syncRcStack(newClientGeneration);
}
} }
/** /**
@@ -3133,11 +3131,13 @@ public class AudioService extends IAudioService.Stub {
// TODO remove log before release // TODO remove log before release
Log.i(TAG, "Clear remote control display"); Log.i(TAG, "Clear remote control display");
synchronized(mCurrentRcLock) { synchronized(mRCStack) {
mCurrentRcClientGen++; synchronized(mCurrentRcLock) {
mCurrentRcClientGen++;
// synchronously update the displays and clients with the new client generation // synchronously update the displays and clients with the new client generation
setNewRcClient(mCurrentRcClientGen, null /*event receiver*/, true /*clearing*/); setNewRcClient_syncAfRcsCurrc(mCurrentRcClientGen,
null /*event receiver*/, true /*clearing*/);
}
} }
} }
@@ -3145,30 +3145,32 @@ public class AudioService extends IAudioService.Stub {
* Called when processing MSG_RCDISPLAY_UPDATE event * Called when processing MSG_RCDISPLAY_UPDATE event
*/ */
private void onRcDisplayUpdate(RemoteControlStackEntry rcse, int flags /* USED ?*/) { private void onRcDisplayUpdate(RemoteControlStackEntry rcse, int flags /* USED ?*/) {
synchronized(mCurrentRcLock) { synchronized(mRCStack) {
if ((mCurrentRcClient != null) && (mCurrentRcClient.equals(rcse.mRcClient))) { synchronized(mCurrentRcLock) {
// TODO remove log before release if ((mCurrentRcClient != null) && (mCurrentRcClient.equals(rcse.mRcClient))) {
Log.i(TAG, "Display/update remote control "); // TODO remove log before release
Log.i(TAG, "Display/update remote control ");
mCurrentRcClientGen++; mCurrentRcClientGen++;
// synchronously update the displays and clients with
// the new client generation
setNewRcClient_syncAfRcsCurrc(mCurrentRcClientGen,
rcse.mReceiverComponent /*event receiver*/,
false /*clearing*/);
// synchronously update the displays and clients with the new client generation // ask the current client that it needs to send info
setNewRcClient(mCurrentRcClientGen, try {
rcse.mReceiverComponent /*event receiver*/, mCurrentRcClient.onInformationRequested(mCurrentRcClientGen,
false /*clearing*/); flags, mArtworkExpectedWidth, mArtworkExpectedHeight);
} catch (RemoteException e) {
// ask the current client that it needs to send info Log.e(TAG, "Current valid remote client is dead: "+e);
try { mCurrentRcClient = null;
mCurrentRcClient.onInformationRequested(mCurrentRcClientGen, }
flags, mArtworkExpectedWidth, mArtworkExpectedHeight); } else {
} catch (RemoteException e) { // the remote control display owner has changed between the
Log.e(TAG, "Current valid remote client is dead: "+e); // the message to update the display was sent, and the time it
mCurrentRcClient = null; // gets to be processed (now)
} }
} else {
// the remote control display owner has changed between the
// the message to update the display was sent, and the time it
// gets to be processed (now)
} }
} }
} }