Merge "Remove empty remote control client listener methods" (e83af902) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+4 −20

Original line number	Diff line number	Diff line
		@@ -1802,35 +1802,19 @@ public class AudioManager {

		/**
		* @hide
		* FIXME to be changed to address Neel's comments
		* Force a refresh of the remote control client associated with the event receiver.
		* Notifies the users of the associated remote control client that the information to display
		* has changed.
		* @param eventReceiver
		*/
		public void refreshRemoteControlDisplay(ComponentName eventReceiver) {
		public void notifyRemoteControlInformationChanged(ComponentName eventReceiver) {
		IAudioService service = getService();
		try {
		service.refreshRemoteControlDisplay(eventReceiver);
		service.notifyRemoteControlInformationChanged(eventReceiver);
		} catch (RemoteException e) {
		Log.e(TAG, "Dead object in refreshRemoteControlDisplay"+e);
		}
		}

		/**
		* @hide
		* FIXME API to be used by implementors of remote controls, not a candidate for SDK
		*/
		public void registerRemoteControlObserver() {

		}

		/**
		* @hide
		* FIXME API to be used by implementors of remote controls, not a candidate for SDK
		*/
		public void unregisterRemoteControlObserver() {

		}

		/**
		* @hide
		* Reload audio settings. This method is called by Settings backup

+2 −2

Original line number	Diff line number	Diff line
		@@ -3200,8 +3200,8 @@ public class AudioService extends IAudioService.Stub {
		}
		}

		/** see AudioManager.refreshRemoteControlDisplay(ComponentName er) */
		public void refreshRemoteControlDisplay(ComponentName eventReceiver) {
		/** see AudioManager.notifyRemoteControlInformationChanged(ComponentName er) */
		public void notifyRemoteControlInformationChanged(ComponentName eventReceiver) {
		synchronized(mAudioFocusLock) {
		synchronized(mRCStack) {
		// only refresh if the eventReceiver is at the top of the stack

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ interface IAudioService {
		void registerRemoteControlClient(in ComponentName eventReceiver,
		in IRemoteControlClient rcClient, in String callingPackageName);

		void refreshRemoteControlDisplay(in ComponentName eventReceiver);
		void notifyRemoteControlInformationChanged(in ComponentName eventReceiver);

		void startBluetoothSco(IBinder cb);