Merge "MediaController: Use Context#getPackageName() for RemoteUserInfo" (ebaf2f58) · Commits · e / os / android_frameworks_av

packages/MediaComponents/apex/java/android/media/session/ISessionController.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,9 +48,9 @@ interface ISessionController {
		PendingIntent getLaunchPendingIntent();
		long getFlags();
		ParcelableVolumeInfo getVolumeAttributes();
		void adjustVolume(String packageName, ISessionControllerCallback caller,
		void adjustVolume(String packageName, String opPackageName, ISessionControllerCallback caller,
		boolean asSystemService, int direction, int flags);
		void setVolumeTo(String packageName, ISessionControllerCallback caller,
		void setVolumeTo(String packageName, String opPackageName, ISessionControllerCallback caller,
		int value, int flags);

		// These commands are for the TransportControls

packages/MediaComponents/apex/java/android/media/session/ISessionManager.aidl

+4 −12

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ package android.media.session;

		import android.content.ComponentName;
		import android.media.IRemoteVolumeController;
		import android.media.ISessionTokensListener;
		import android.media.session.IActiveSessionsListener;
		import android.media.session.ICallback;
		import android.media.session.IOnMediaKeyListener;
		@@ -36,9 +35,10 @@ interface ISessionManager {
		List<IBinder> getSessions(in ComponentName compName, int userId);
		void dispatchMediaKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent,
		boolean needWakeLock);
		void dispatchVolumeKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent,
		int stream, boolean musicOnly);
		void dispatchAdjustVolume(String packageName, int suggestedStream, int delta, int flags);
		void dispatchVolumeKeyEvent(String packageName, String opPackageName, boolean asSystemService,
		in KeyEvent keyEvent, int stream, boolean musicOnly);
		void dispatchAdjustVolume(String packageName, String opPackageName, int suggestedStream,
		int delta, int flags);
		void addSessionsListener(in IActiveSessionsListener listener, in ComponentName compName,
		int userId);
		void removeSessionsListener(in IActiveSessionsListener listener);
		@@ -55,12 +55,4 @@ interface ISessionManager {

		// MediaSession2
		boolean isTrusted(String controllerPackageName, int controllerPid, int controllerUid);
		boolean createSession2(in Bundle sessionToken);
		void destroySession2(in Bundle sessionToken);
		List<Bundle> getSessionTokens(boolean activeSessionOnly, boolean sessionServiceOnly,
		String packageName);

		void addSessionTokensListener(in ISessionTokensListener listener, int userId,
		String packageName);
		void removeSessionTokensListener(in ISessionTokensListener listener, String packageName);
		}

packages/MediaComponents/apex/java/android/media/session/MediaController.java

+30 −28

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public final class MediaController {
		return false;
		}
		try {
		return mSessionBinder.sendMediaButton(mContext.getOpPackageName(), mCbStub,
		return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub,
		asSystemService, keyEvent);
		} catch (RemoteException e) {
		// System is dead. =(
		@@ -186,8 +186,9 @@ public final class MediaController {
		break;
		}
		try {
		mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, true,
		direction, AudioManager.FLAG_SHOW_UI);
		mSessionBinder.adjustVolume(mContext.getPackageName(),
		mContext.getOpPackageName(), mCbStub, true, direction,
		AudioManager.FLAG_SHOW_UI);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling adjustVolumeBy", e);
		}
		@@ -197,8 +198,8 @@ public final class MediaController {
		final int flags = AudioManager.FLAG_PLAY_SOUND \| AudioManager.FLAG_VIBRATE
		\| AudioManager.FLAG_FROM_KEY;
		try {
		mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, true, 0,
		flags);
		mSessionBinder.adjustVolume(mContext.getPackageName(),
		mContext.getOpPackageName(), mCbStub, true, 0, flags);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling adjustVolumeBy", e);
		}
		@@ -367,7 +368,8 @@ public final class MediaController {
		*/
		public void setVolumeTo(int value, int flags) {
		try {
		mSessionBinder.setVolumeTo(mContext.getOpPackageName(), mCbStub, value, flags);
		mSessionBinder.setVolumeTo(mContext.getPackageName(), mContext.getOpPackageName(),
		mCbStub, value, flags);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling setVolumeTo.", e);
		}
		@@ -388,8 +390,8 @@ public final class MediaController {
		*/
		public void adjustVolume(int direction, int flags) {
		try {
		mSessionBinder.adjustVolume(mContext.getOpPackageName(), mCbStub, false, direction,
		flags);
		mSessionBinder.adjustVolume(mContext.getPackageName(), mContext.getOpPackageName(),
		mCbStub, false, direction, flags);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling adjustVolumeBy.", e);
		}
		@@ -455,7 +457,7 @@ public final class MediaController {
		throw new IllegalArgumentException("command cannot be null or empty");
		}
		try {
		mSessionBinder.sendCommand(mContext.getOpPackageName(), mCbStub, command, args, cb);
		mSessionBinder.sendCommand(mContext.getPackageName(), mCbStub, command, args, cb);
		} catch (RemoteException e) {
		Log.d(TAG, "Dead object in sendCommand.", e);
		}
		@@ -521,7 +523,7 @@ public final class MediaController {

		if (!mCbRegistered) {
		try {
		mSessionBinder.registerCallbackListener(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.registerCallbackListener(mContext.getPackageName(), mCbStub);
		mCbRegistered = true;
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in registerCallback", e);
		@@ -668,7 +670,7 @@ public final class MediaController {
		*/
		public void prepare() {
		try {
		mSessionBinder.prepare(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.prepare(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling prepare.", e);
		}
		@@ -692,7 +694,7 @@ public final class MediaController {
		"You must specify a non-empty String for prepareFromMediaId.");
		}
		try {
		mSessionBinder.prepareFromMediaId(mContext.getOpPackageName(), mCbStub, mediaId,
		mSessionBinder.prepareFromMediaId(mContext.getPackageName(), mCbStub, mediaId,
		extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling prepare(" + mediaId + ").", e);
		@@ -719,7 +721,7 @@ public final class MediaController {
		query = "";
		}
		try {
		mSessionBinder.prepareFromSearch(mContext.getOpPackageName(), mCbStub, query,
		mSessionBinder.prepareFromSearch(mContext.getPackageName(), mCbStub, query,
		extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling prepare(" + query + ").", e);
		@@ -744,7 +746,7 @@ public final class MediaController {
		"You must specify a non-empty Uri for prepareFromUri.");
		}
		try {
		mSessionBinder.prepareFromUri(mContext.getOpPackageName(), mCbStub, uri, extras);
		mSessionBinder.prepareFromUri(mContext.getPackageName(), mCbStub, uri, extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling prepare(" + uri + ").", e);
		}
		@@ -755,7 +757,7 @@ public final class MediaController {
		*/
		public void play() {
		try {
		mSessionBinder.play(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.play(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling play.", e);
		}
		@@ -774,7 +776,7 @@ public final class MediaController {
		"You must specify a non-empty String for playFromMediaId.");
		}
		try {
		mSessionBinder.playFromMediaId(mContext.getOpPackageName(), mCbStub, mediaId,
		mSessionBinder.playFromMediaId(mContext.getPackageName(), mCbStub, mediaId,
		extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling play(" + mediaId + ").", e);
		@@ -797,7 +799,7 @@ public final class MediaController {
		query = "";
		}
		try {
		mSessionBinder.playFromSearch(mContext.getOpPackageName(), mCbStub, query, extras);
		mSessionBinder.playFromSearch(mContext.getPackageName(), mCbStub, query, extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling play(" + query + ").", e);
		}
		@@ -816,7 +818,7 @@ public final class MediaController {
		"You must specify a non-empty Uri for playFromUri.");
		}
		try {
		mSessionBinder.playFromUri(mContext.getOpPackageName(), mCbStub, uri, extras);
		mSessionBinder.playFromUri(mContext.getPackageName(), mCbStub, uri, extras);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling play(" + uri + ").", e);
		}
		@@ -828,7 +830,7 @@ public final class MediaController {
		*/
		public void skipToQueueItem(long id) {
		try {
		mSessionBinder.skipToQueueItem(mContext.getOpPackageName(), mCbStub, id);
		mSessionBinder.skipToQueueItem(mContext.getPackageName(), mCbStub, id);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling skipToItem(" + id + ").", e);
		}
		@@ -840,7 +842,7 @@ public final class MediaController {
		*/
		public void pause() {
		try {
		mSessionBinder.pause(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.pause(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling pause.", e);
		}
		@@ -852,7 +854,7 @@ public final class MediaController {
		*/
		public void stop() {
		try {
		mSessionBinder.stop(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.stop(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling stop.", e);
		}
		@@ -865,7 +867,7 @@ public final class MediaController {
		*/
		public void seekTo(long pos) {
		try {
		mSessionBinder.seekTo(mContext.getOpPackageName(), mCbStub, pos);
		mSessionBinder.seekTo(mContext.getPackageName(), mCbStub, pos);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling seekTo.", e);
		}
		@@ -877,7 +879,7 @@ public final class MediaController {
		*/
		public void fastForward() {
		try {
		mSessionBinder.fastForward(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.fastForward(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling fastForward.", e);
		}
		@@ -888,7 +890,7 @@ public final class MediaController {
		*/
		public void skipToNext() {
		try {
		mSessionBinder.next(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.next(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling next.", e);
		}
		@@ -900,7 +902,7 @@ public final class MediaController {
		*/
		public void rewind() {
		try {
		mSessionBinder.rewind(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.rewind(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling rewind.", e);
		}
		@@ -911,7 +913,7 @@ public final class MediaController {
		*/
		public void skipToPrevious() {
		try {
		mSessionBinder.previous(mContext.getOpPackageName(), mCbStub);
		mSessionBinder.previous(mContext.getPackageName(), mCbStub);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling previous.", e);
		}
		@@ -926,7 +928,7 @@ public final class MediaController {
		*/
		public void setRating(Rating rating) {
		try {
		mSessionBinder.rate(mContext.getOpPackageName(), mCbStub, rating);
		mSessionBinder.rate(mContext.getPackageName(), mCbStub, rating);
		} catch (RemoteException e) {
		Log.wtf(TAG, "Error calling rate.", e);
		}
		@@ -961,7 +963,7 @@ public final class MediaController {
		throw new IllegalArgumentException("CustomAction cannot be null.");
		}
		try {
		mSessionBinder.sendCustomAction(mContext.getOpPackageName(), mCbStub, action, args);
		mSessionBinder.sendCustomAction(mContext.getPackageName(), mCbStub, action, args);
		} catch (RemoteException e) {
		Log.d(TAG, "Dead object in sendCustomAction.", e);
		}