Merge "Remove empty remote control client listener methods"
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 731d1f3..e7a306b 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1802,36 +1802,20 @@
/**
* @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
* agent when audio settings are restored and causes the AudioService
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index cd55b0e..bf1585d 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3200,8 +3200,8 @@
}
}
- /** 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
diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl
index 1a05f152..9afe553 100644
--- a/media/java/android/media/IAudioService.aidl
+++ b/media/java/android/media/IAudioService.aidl
@@ -93,7 +93,7 @@
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);