Merge "Make AudioManager.generateAudioSessionId() static"

2 files changed, 2 insertions, 3 deletions

diff --git a/api/current.txt b/api/current.txt
index eb1849f4384b..ff78d481f4de 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -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);
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 274da11c04ef..976d3803096f 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -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;