Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()" (99cd4d47) · Commits · e / os / android_frameworks_base

media/apex/java/android/media/session/MediaSessionEngine.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -450,13 +450,25 @@ public final class MediaSessionEngine implements AutoCloseable {
		return mCallbackHandler.mCurrentControllerInfo;
		}

		/**
		* Returns the name of the package that sent the last media button, transport control, or
		* command from controllers and the system. This is only valid while in a request callback, such
		* as {@link MediaSession.Callback#onPlay}.
		*/
		public String getCallingPackage() {
		if (mCallbackHandler != null && mCallbackHandler.mCurrentControllerInfo != null) {
		return mCallbackHandler.mCurrentControllerInfo.getPackageName();
		}
		return null;
		}


		/**
		* Notify the system that the remote volume changed.
		*
		* @param provider The provider that is handling volume changes.
		* @hide
		*/
		public void notifyRemoteVolumeChanged(VolumeProvider provider) {
		private void notifyRemoteVolumeChanged(VolumeProvider provider) {
		synchronized (mLock) {
		if (provider == null \|\| provider != mVolumeProvider) {
		Log.w(TAG, "Received update from stale volume provider");
		@@ -470,18 +482,6 @@ public final class MediaSessionEngine implements AutoCloseable {
		}
		}

		/**
		* Returns the name of the package that sent the last media button, transport control, or
		* command from controllers and the system. This is only valid while in a request callback, such
		* as {@link MediaSession.Callback#onPlay}.
		*/
		public String getCallingPackage() {
		if (mCallbackHandler != null && mCallbackHandler.mCurrentControllerInfo != null) {
		return mCallbackHandler.mCurrentControllerInfo.getPackageName();
		}
		return null;
		}

		private void dispatchPrepare(RemoteUserInfo caller) {
		postToCallback(caller, CallbackMessageHandler.MSG_PREPARE, null, null);
		}

media/java/android/media/session/MediaSession.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -391,16 +391,6 @@ public final class MediaSession {
		return mImpl.getCurrentControllerInfo();
		}

		/**
		* Notify the system that the remote volume changed.
		*
		* @param provider The provider that is handling volume changes.
		* @hide
		*/
		public void notifyRemoteVolumeChanged(VolumeProvider provider) {
		mImpl.notifyRemoteVolumeChanged(provider);
		}

		/**
		* Returns the name of the package that sent the last media button, transport control, or
		* command from controllers and the system. This is only valid while in a request callback, such