Merge "Hide Media*2 APIs" into pi-dev (b598645e) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −796

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/widget/MediaControlView2.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ import java.lang.annotation.RetentionPolicy;

	// TODO: Use link annotation to refer VideoView2 once VideoView2 became unhidden.		// TODO: Use link annotation to refer VideoView2 once VideoView2 became unhidden.
	/**		/**
			* @hide
	* A View that contains the controls for MediaPlayer2.		* A View that contains the controls for MediaPlayer2.
	* It provides a wide range of UI including buttons such as "Play/Pause", "Rewind", "Fast Forward",		* It provides a wide range of UI including buttons such as "Play/Pause", "Rewind", "Fast Forward",
	* "Subtitle", "Full Screen", and it is also possible to add multiple custom buttons.		* "Subtitle", "Full Screen", and it is also possible to add multiple custom buttons.

core/java/android/widget/VideoView2.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,7 @@ import java.util.concurrent.Executor;

	// TODO: Replace MediaSession wtih MediaSession2 once MediaSession2 is submitted.		// TODO: Replace MediaSession wtih MediaSession2 once MediaSession2 is submitted.
	/**		/**
			* @hide
	* Displays a video file. VideoView2 class is a View class which is wrapping {@link MediaPlayer2}		* Displays a video file. VideoView2 class is a View class which is wrapping {@link MediaPlayer2}
	* so that developers can easily implement a video rendering application.		* so that developers can easily implement a video rendering application.
	*		*

media/java/android/media/AudioManager.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1352,6 +1352,7 @@ public class AudioManager {
	//====================================================================		//====================================================================
	// Offload query		// Offload query
	/**		/**
			* @hide
	* Returns whether offloaded playback of an audio format is supported on the device.		* Returns whether offloaded playback of an audio format is supported on the device.
	* Offloaded playback is where the decoding of an audio stream is not competing with other		* Offloaded playback is where the decoding of an audio stream is not competing with other
	* software resources. In general, it is supported by dedicated hardware, such as audio DSPs.		* software resources. In general, it is supported by dedicated hardware, such as audio DSPs.

media/java/android/media/AudioTrack.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -896,6 +896,7 @@ public class AudioTrack extends PlayerBase
	}		}

	/**		/**
			* @hide
	* Sets whether this track will play through the offloaded audio path.		* Sets whether this track will play through the offloaded audio path.
	* When set to true, at build time, the audio format will be checked against		* When set to true, at build time, the audio format will be checked against
	* {@link AudioManager#isOffloadedPlaybackSupported(AudioFormat)} to verify the audio format		* {@link AudioManager#isOffloadedPlaybackSupported(AudioFormat)} to verify the audio format
	@@ -2979,6 +2980,7 @@ public class AudioTrack extends PlayerBase
	}		}

	/**		/**
			* @hide
	* Abstract class to receive event notification about the stream playback.		* Abstract class to receive event notification about the stream playback.
	* See {@link AudioTrack#setStreamEventCallback(Executor, StreamEventCallback)} to register		* See {@link AudioTrack#setStreamEventCallback(Executor, StreamEventCallback)} to register
	* the callback on the given {@link AudioTrack} instance.		* the callback on the given {@link AudioTrack} instance.
	@@ -3012,6 +3014,7 @@ public class AudioTrack extends PlayerBase
	private final Object mStreamEventCbLock = new Object();		private final Object mStreamEventCbLock = new Object();

	/**		/**
			* @hide
	* Sets the callback for the notification of stream events.		* Sets the callback for the notification of stream events.
	* @param executor {@link Executor} to handle the callbacks		* @param executor {@link Executor} to handle the callbacks
	* @param eventCallback the callback to receive the stream event notifications		* @param eventCallback the callback to receive the stream event notifications
	@@ -3031,6 +3034,7 @@ public class AudioTrack extends PlayerBase
	}		}

	/**		/**
			* @hide
	* Unregisters the callback for notification of stream events, previously set		* Unregisters the callback for notification of stream events, previously set
	* by {@link #setStreamEventCallback(Executor, StreamEventCallback)}.		* by {@link #setStreamEventCallback(Executor, StreamEventCallback)}.
	*/		*/