Merge \"Fix deadlock b/w ActivityManagerService and MediaSessionService\"

am: 4eea3a7f88

Change-Id: I499c69fd3890ada652213c0510df3b884223a5df

services/core/java/com/android/server/media/MediaSessionService.java

@@ -890,13 +890,24 @@ public class MediaSessionService extends SystemService implements Monitor {
                     }
                     return;
                 }
-                try {
+
-                    String packageName = getContext().getOpPackageName();
+                // Execute mAudioService.adjustSuggestedStreamVolume() on
-                    mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream,
+                // handler thread of MediaSessionService.
-                            flags, packageName, TAG);
+                // This will release the MediaSessionService.mLock sooner and avoid
-                } catch (RemoteException e) {
+                // a potential deadlock between MediaSessionService.mLock and
-                    Log.e(TAG, "Error adjusting default volume.", e);
+                // 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);