diff options
| -rw-r--r-- | services/core/java/com/android/server/media/MediaSessionService.java | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 7028fa6695f6..1a320d2bdb80 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -887,13 +887,24 @@ public class MediaSessionService extends SystemService implements Monitor { } return; } - try { - String packageName = getContext().getOpPackageName(); - mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream, - flags, packageName, TAG); - } catch (RemoteException e) { - Log.e(TAG, "Error adjusting default volume.", e); - } + + // Execute mAudioService.adjustSuggestedStreamVolume() on + // handler thread of MediaSessionService. + // This will release the MediaSessionService.mLock sooner and avoid + // a potential deadlock between MediaSessionService.mLock and + // ActivityManagerService lock. + mHandler.post(new Runnable() { + @Override + public void run() { + try { + String packageName = getContext().getOpPackageName(); + mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream, + flags, packageName, TAG); + } catch (RemoteException e) { + Log.e(TAG, "Error adjusting default volume.", e); + } + } + }); } else { session.adjustVolume(direction, flags, getContext().getPackageName(), UserHandle.myUserId(), true); |