Merge \\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\" am: 4eea3a7f88 (b91869d3) · Commits · e / os / android_frameworks_base

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

+18 −7

Original line number	Diff line number	Diff line
		@@ -890,6 +890,15 @@ public class MediaSessionService extends SystemService implements Monitor {
		}
		return;
		}

		// 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,
		@@ -897,6 +906,8 @@ public class MediaSessionService extends SystemService implements Monitor {
		} catch (RemoteException e) {
		Log.e(TAG, "Error adjusting default volume.", e);
		}
		}
		});
		} else {
		session.adjustVolume(direction, flags, getContext().getPackageName(),
		UserHandle.myUserId(), true);