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

Commit 9cc2c5ce authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Audio recording activity notification: change callback name" into nyc-dev

parents 4b8a152d e6a505b7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19812,7 +19812,7 @@ package android.media { 














  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













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













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















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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



























  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













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













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















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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



























  public static abstract class AudioManager.AudioRecordingCallback {















    ctor public AudioManager.AudioRecordingCallback();













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













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















  }





























  public static abstract interface AudioManager.OnAudioFocusChangeListener {

























media/java/android/media/AudioManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -2157,7 +2157,7 @@ public class AudioManager {













                                final RecordConfigChangeCallbackData cbData =















                                        (RecordConfigChangeCallbackData) msg.obj;















                                if (cbData.mCb != null) {













                                    cbData.mCb.onRecordConfigChanged(cbData.mConfigs);













                                    cbData.mCb.onRecordingConfigChanged(cbData.mConfigs);















                                }















                                break;















                            default:










@@ -2746,7 +2746,7 @@ public class AudioManager {













         * @param configs array containing the results of















         *      {@link AudioManager#getActiveRecordingConfigurations()}.















         */













        public void onRecordConfigChanged(AudioRecordingConfiguration[] configs) {}













        public void onRecordingConfigChanged(AudioRecordingConfiguration[] configs) {}















    }































    private static class AudioRecordingCallbackInfo {