Merge "Notification of playback activity" (c0a0c2bd) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -402,6 +402,8 @@ LOCAL_SRC_FILES += \
		media/java/android/media/IMediaRouterService.aidl \
		media/java/android/media/IMediaScannerListener.aidl \
		media/java/android/media/IMediaScannerService.aidl \
		media/java/android/media/IPlaybackConfigDispatcher.aidl \
		media/java/android/media/IPlayer.aidl \
		media/java/android/media/IRecordingConfigDispatcher.aidl \
		media/java/android/media/IRemoteDisplayCallback.aidl \
		media/java/android/media/IRemoteDisplayProvider.aidl \

api/current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -20092,6 +20092,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations();
		method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		@@ -20115,6 +20116,7 @@ package android.media {
		method public void playSoundEffect(int);
		method public void playSoundEffect(int, float);
		method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, android.os.Handler);
		method public void registerAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback, android.os.Handler);
		method public void registerAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback, android.os.Handler);
		method public deprecated void registerMediaButtonEventReceiver(android.content.ComponentName);
		method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);
		@@ -20139,6 +20141,7 @@ package android.media {
		method public void stopBluetoothSco();
		method public void unloadSoundEffects();
		method public void unregisterAudioDeviceCallback(android.media.AudioDeviceCallback);
		method public void unregisterAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback);
		method public void unregisterAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback);
		method public deprecated void unregisterMediaButtonEventReceiver(android.content.ComponentName);
		method public deprecated void unregisterMediaButtonEventReceiver(android.app.PendingIntent);
		@@ -20237,6 +20240,11 @@ package android.media {
		field public static final deprecated int VIBRATE_TYPE_RINGER = 0; // 0x0
		}

		public static abstract class AudioManager.AudioPlaybackCallback {
		ctor public AudioManager.AudioPlaybackCallback();
		method public void onPlaybackConfigChanged(java.util.List<android.media.AudioPlaybackConfiguration>);
		}

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);
		@@ -20246,6 +20254,13 @@ package android.media {
		method public abstract void onAudioFocusChange(int);
		}

		public final class AudioPlaybackConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioAttributes getAudioAttributes();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioPlaybackConfiguration> CREATOR;
		}

		public class AudioRecord implements android.media.AudioRouting {
		ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
		method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);

api/system-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -21601,6 +21601,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations();
		method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		@@ -21625,6 +21626,7 @@ package android.media {
		method public void playSoundEffect(int);
		method public void playSoundEffect(int, float);
		method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, android.os.Handler);
		method public void registerAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback, android.os.Handler);
		method public int registerAudioPolicy(android.media.audiopolicy.AudioPolicy);
		method public void registerAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback, android.os.Handler);
		method public deprecated void registerMediaButtonEventReceiver(android.content.ComponentName);
		@@ -21652,6 +21654,7 @@ package android.media {
		method public void stopBluetoothSco();
		method public void unloadSoundEffects();
		method public void unregisterAudioDeviceCallback(android.media.AudioDeviceCallback);
		method public void unregisterAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback);
		method public void unregisterAudioPolicyAsync(android.media.audiopolicy.AudioPolicy);
		method public void unregisterAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback);
		method public deprecated void unregisterMediaButtonEventReceiver(android.content.ComponentName);
		@@ -21754,6 +21757,11 @@ package android.media {
		field public static final deprecated int VIBRATE_TYPE_RINGER = 0; // 0x0
		}

		public static abstract class AudioManager.AudioPlaybackCallback {
		ctor public AudioManager.AudioPlaybackCallback();
		method public void onPlaybackConfigChanged(java.util.List<android.media.AudioPlaybackConfiguration>);
		}

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);
		@@ -21763,6 +21771,28 @@ package android.media {
		method public abstract void onAudioFocusChange(int);
		}

		public final class AudioPlaybackConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioAttributes getAudioAttributes();
		method public int getClientPid();
		method public int getClientUid();
		method public int getPlayerState();
		method public int getPlayerType();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioPlaybackConfiguration> CREATOR;
		field public static final int PLAYER_STATE_IDLE = 1; // 0x1
		field public static final int PLAYER_STATE_PAUSED = 3; // 0x3
		field public static final int PLAYER_STATE_RELEASED = 0; // 0x0
		field public static final int PLAYER_STATE_STARTED = 2; // 0x2
		field public static final int PLAYER_STATE_STOPPED = 4; // 0x4
		field public static final int PLAYER_STATE_UNKNOWN = -1; // 0xffffffff
		field public static final int PLAYER_TYPE_JAM_AUDIOTRACK = 1; // 0x1
		field public static final int PLAYER_TYPE_JAM_MEDIAPLAYER = 2; // 0x2
		field public static final int PLAYER_TYPE_JAM_SOUNDPOOL = 3; // 0x3
		field public static final int PLAYER_TYPE_SLES_AUDIOPLAYER = 11; // 0xb
		field public static final int PLAYER_TYPE_UNKNOWN = -1; // 0xffffffff
		}

		public class AudioRecord implements android.media.AudioRouting {
		ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
		ctor public AudioRecord(android.media.AudioAttributes, android.media.AudioFormat, int, int) throws java.lang.IllegalArgumentException;

api/test-current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -20179,6 +20179,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations();
		method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		@@ -20202,6 +20203,7 @@ package android.media {
		method public void playSoundEffect(int);
		method public void playSoundEffect(int, float);
		method public void registerAudioDeviceCallback(android.media.AudioDeviceCallback, android.os.Handler);
		method public void registerAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback, android.os.Handler);
		method public void registerAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback, android.os.Handler);
		method public deprecated void registerMediaButtonEventReceiver(android.content.ComponentName);
		method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);
		@@ -20226,6 +20228,7 @@ package android.media {
		method public void stopBluetoothSco();
		method public void unloadSoundEffects();
		method public void unregisterAudioDeviceCallback(android.media.AudioDeviceCallback);
		method public void unregisterAudioPlaybackCallback(android.media.AudioManager.AudioPlaybackCallback);
		method public void unregisterAudioRecordingCallback(android.media.AudioManager.AudioRecordingCallback);
		method public deprecated void unregisterMediaButtonEventReceiver(android.content.ComponentName);
		method public deprecated void unregisterMediaButtonEventReceiver(android.app.PendingIntent);
		@@ -20324,6 +20327,11 @@ package android.media {
		field public static final deprecated int VIBRATE_TYPE_RINGER = 0; // 0x0
		}

		public static abstract class AudioManager.AudioPlaybackCallback {
		ctor public AudioManager.AudioPlaybackCallback();
		method public void onPlaybackConfigChanged(java.util.List<android.media.AudioPlaybackConfiguration>);
		}

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);
		@@ -20333,6 +20341,13 @@ package android.media {
		method public abstract void onAudioFocusChange(int);
		}

		public final class AudioPlaybackConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioAttributes getAudioAttributes();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioPlaybackConfiguration> CREATOR;
		}

		public class AudioRecord implements android.media.AudioRouting {
		ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
		method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);

core/jni/android_media_AudioSystem.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,12 @@ android_media_AudioSystem_newAudioSessionId(JNIEnv *env, jobject thiz)
		return AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
		}

		static jint
		android_media_AudioSystem_newAudioPlayerId(JNIEnv *env, jobject thiz)
		{
		return AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_PLAYER);
		}

		static jint
		android_media_AudioSystem_setParameters(JNIEnv *env, jobject thiz, jstring keyValuePairs)
		{
		@@ -1755,6 +1761,7 @@ static const JNINativeMethod gMethods[] = {
		{"isStreamActiveRemotely","(II)Z", (void *)android_media_AudioSystem_isStreamActiveRemotely},
		{"isSourceActive", "(I)Z", (void *)android_media_AudioSystem_isSourceActive},
		{"newAudioSessionId", "()I", (void *)android_media_AudioSystem_newAudioSessionId},
		{"newAudioPlayerId", "()I", (void *)android_media_AudioSystem_newAudioPlayerId},
		{"setDeviceConnectionState", "(IILjava/lang/String;Ljava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState},
		{"getDeviceConnectionState", "(ILjava/lang/String;)I", (void *)android_media_AudioSystem_getDeviceConnectionState},
		{"setPhoneState", "(I)I", (void *)android_media_AudioSystem_setPhoneState},