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

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

Merge "Make AudioManager.generateAudioSessionId() static"

parents 927892e9 2d767d2f

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 int generateAudioSessionId();

    method public static 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 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;

import android.view.KeyEvent;



import com.android.internal.annotations.GuardedBy;
@@ -1912,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 int generateAudioSessionId() {

    public static int generateAudioSessionId() {

        int session = AudioSystem.newAudioSessionId();

        if (session > 0) {

            return session;