Merge "Fix 5242200 only update RemoteControlDisplay when a client is present" (528e382f) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioService.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -3193,7 +3193,7 @@ public class AudioService extends IAudioService.Stub {
		/**
		* Helper function:
		* Called synchronized on mRCStack
		* mRCStack.empty() is false
		* mRCStack.isEmpty() is false
		*/
		private void updateRemoteControlDisplay_syncRcs(int infoChangedFlags) {
		RemoteControlStackEntry rcse = mRCStack.peek();
		@@ -3247,6 +3247,7 @@ public class AudioService extends IAudioService.Stub {
		return;
		}
		// refresh conditions were verified: update the remote controls
		// ok to call, mRCStack is not empty
		updateRemoteControlDisplay_syncRcs(infoChangedFlags);
		}

		@@ -3460,10 +3461,12 @@ public class AudioService extends IAudioService.Stub {
		}
		}

		if (!mRCStack.isEmpty()) {
		// we have a new display, of which all the clients are now aware: have it be updated
		updateRemoteControlDisplay_syncRcs(RC_INFO_ALL);
		}
		}
		}

		/**
		* Unregister an IRemoteControlDisplay.