Merge "Unhide the MediaButton receiver API in android.media.AudioManager" (d6e2cb05) · Commits · e / os / android_frameworks_base

api/current.xml

+26 −0

Original line number	Diff line number	Diff line
		@@ -80658,6 +80658,19 @@
		<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">
		</parameter>
		</method>
		<method name="registerMediaButtonEventReceiver"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="eventReceiver" type="android.content.ComponentName">
		</parameter>
		</method>
		<method name="requestAudioFocus"
		return="int"
		abstract="false"
		@@ -80917,6 +80930,19 @@
		<parameter name="l" type="android.media.AudioManager.OnAudioFocusChangeListener">
		</parameter>
		</method>
		<method name="unregisterMediaButtonEventReceiver"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="eventReceiver" type="android.content.ComponentName">
		</parameter>
		</method>
		<field name="ACTION_AUDIO_BECOMING_NOISY"
		type="java.lang.String"
		transient="false"

+0 −27

Original line number	Diff line number	Diff line
		@@ -1472,8 +1472,6 @@ public class AudioManager {
		//====================================================================
		// Remote Control
		/**
		* @hide
		* TODO unhide for SDK
		* TODO document for SDK
		* @param eventReceiver identifier of a {@link android.content.BroadcastReceiver}
		* that will receive the media button intent. This broadcast receiver must be declared
		@@ -1490,21 +1488,6 @@ public class AudioManager {
		}

		/**
		* @hide
		* TODO unhide for SDK
		* TODO document for SDK
		* @param eventReceiverClass class of a {@link android.content.BroadcastReceiver} that will
		* receive the media button intent. This broadcast receiver must be declared in the
		* application manifest.
		*/
		public void registerMediaButtonEventReceiver(Class<?> eventReceiverClass) {
		registerMediaButtonEventReceiver(new ComponentName(
		eventReceiverClass.getPackage().getName(), eventReceiverClass.getName()));
		}

		/**
		* @hide
		* TODO unhide for SDK
		* TODO document for SDK
		*/
		public void unregisterMediaButtonEventReceiver(ComponentName eventReceiver) {
		@@ -1516,16 +1499,6 @@ public class AudioManager {
		}
		}

		/**
		* @hide
		* TODO unhide for SDK
		* TODO document for SDK
		*/
		public void unregisterMediaButtonEventReceiver(Class<?> eventReceiverClass) {
		unregisterMediaButtonEventReceiver(new ComponentName(
		eventReceiverClass.getPackage().getName(), eventReceiverClass.getName()));
		}

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