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

Commit 2941387f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Recording activity notification: return list of configuration" into... 

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f am: f2c8fb86
am: 740c0424

* commit '740c0424':
  Recording activity notification: return list of configuration

Change-Id: I3289964e2ceaeb999803abc1f5d485857a80894b
parents e86c588c 740c0424

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19691,7 +19691,7 @@ package android.media { 
    method public void adjustVolume(int, int);

    method public void dispatchMediaKeyEvent(android.view.KeyEvent);

    method public int generateAudioSessionId();

    method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();

    method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();

    method public android.media.AudioDeviceInfo[] getDevices(int);

    method public int getMode();

    method public java.lang.String getParameters(java.lang.String);
@@ -19837,7 +19837,7 @@ package android.media { 














  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













    method public void onRecordingConfigChanged(android.media.AudioRecordingConfiguration[]);













    method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {

























api/removed.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -196,6 +196,10 @@ package android.media {













    ctor public AudioFormat();















  }





























  public static abstract class AudioManager.AudioRecordingCallback {













    method public deprecated void onRecordingConfigChanged(android.media.AudioRecordingConfiguration[]);













  }





























}































package android.media.tv {

































api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -21198,7 +21198,7 @@ package android.media {













    method public void adjustVolume(int, int);















    method public void dispatchMediaKeyEvent(android.view.KeyEvent);















    method public int generateAudioSessionId();













    method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();













    method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();















    method public android.media.AudioDeviceInfo[] getDevices(int);















    method public int getMode();















    method public java.lang.String getParameters(java.lang.String);










@@ -21352,7 +21352,7 @@ package android.media {



























  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













    method public void onRecordingConfigChanged(android.media.AudioRecordingConfiguration[]);













    method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {

























api/system-removed.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -194,6 +194,10 @@ package android.media {













    ctor public AudioFormat();















  }





























  public static abstract class AudioManager.AudioRecordingCallback {













    method public deprecated void onRecordingConfigChanged(android.media.AudioRecordingConfiguration[]);













  }





























}































package android.media.tv {

































api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -19761,7 +19761,7 @@ package android.media {













    method public void adjustVolume(int, int);















    method public void dispatchMediaKeyEvent(android.view.KeyEvent);















    method public int generateAudioSessionId();













    method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();













    method public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();















    method public android.media.AudioDeviceInfo[] getDevices(int);















    method public int getMode();















    method public java.lang.String getParameters(java.lang.String);










@@ -19907,7 +19907,7 @@ package android.media {



























  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













    method public void onRecordingConfigChanged(android.media.AudioRecordingConfiguration[]);













    method public void onRecordingConfigChanged(java.util.List<android.media.AudioRecordingConfiguration>);















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {