diff options
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b4c73362d7cc..6cfcad3c4b9f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2871,6 +2871,7 @@ package android.media { field public static final int AUDIOFOCUS_FLAG_DELAY_OK = 1; // 0x1 field public static final int AUDIOFOCUS_FLAG_LOCK = 4; // 0x4 field public static final int AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS = 2; // 0x2 + field public static final int FLAG_FROM_KEY = 4096; // 0x1000 } public static abstract class AudioManager.AudioServerStateCallback { diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index ff1bdd47f565..d10900e5d160 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -541,6 +541,7 @@ public class AudioManager { * Adjusting the volume due to a hardware key press. * @hide */ + @SystemApi public static final int FLAG_FROM_KEY = 1 << 12; private static final String[] FLAG_NAMES = { |