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

Commit f50b236b authored by Dichen Zhang's avatar Dichen Zhang
Browse files

Revert "Make AudioManager.generateAudioSessionId() static" 

This reverts commit 2d767d2f.

Bug: 119775358
Test: MediaPlayer2Test, androidx media2 integration
Change-Id: I1ea474a6fd02f54e8fa983edf7e188cc732fa7cc
parent 197f2421

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22930,7 +22930,7 @@ package android.media { 
    method public void adjustSuggestedStreamVolume(int, int, int);

    method public void adjustVolume(int, int);

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

    method public static int generateAudioSessionId();

    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);

media/java/android/media/AudioManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1911,7 +1911,7 @@ public class AudioManager { 
     *   system failed to generate a new session, a condition in which audio playback or recording

     *   will subsequently fail as well.

     */

    public static int generateAudioSessionId() {

    public int generateAudioSessionId() {

        int session = AudioSystem.newAudioSessionId();

        if (session > 0) {

            return session;