Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292a6a4e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Notification of playback activity 

AudioService keeps track of status of implementations of PlayerBase.
AudioService's PlaybackActivityMonitor maintains a list of
  playback configurations for each PlayerBase, and a list
  of clients that want to receive updates about the playback.
Playback activity clients can query the playback configuration
  of the system through AudioManager, or register a callback
  for updates. For clients with MODIFY_AUDIO_ROUTING permission
  (system), the playback configurations contain more information
  about each player (player type, uid, pid, state), and can see
  all players, not just the "active" ones. The act of stripping
  off data about the players that is not supposed to be seen
  by non-system clients, is referred to as "anonymization". It
  is implemented in system server, so no system data is ever
  sent to playback activity clients without system permission.
More information about the AudioPlaybackConfiguration is
  available in the SystemApi (uid, pid, player type, player state).

Test: run cts -m CtsMediaTestCases -t android.media.cts.AudioPlaybackConfigurationTest
Bug: 30955183

Change-Id: I85997594c0378216419f5f0fdaa0714996fd3573
parent fe9a2a79

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
@@ -20084,6 +20084,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();
@@ -20107,6 +20108,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);
@@ -20131,6 +20133,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);
@@ -20229,6 +20232,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>);









@@ -20238,6 +20246,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








@@ -21590,6 +21590,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();









@@ -21614,6 +21615,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);










@@ -21641,6 +21643,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);










@@ -21743,6 +21746,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>);









@@ -21752,6 +21760,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








@@ -20171,6 +20171,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();









@@ -20194,6 +20195,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);









@@ -20218,6 +20220,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);










@@ -20316,6 +20319,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>);









@@ -20325,6 +20333,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},