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

Commit 898dd650 authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Make AudioManager.generateAudioSessionId() static""

parents fe36fc24 f50b236b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22948,7 +22948,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;