diff options
| author | 2018-11-30 04:03:30 +0000 | |
|---|---|---|
| committer | 2018-11-30 04:03:30 +0000 | |
| commit | 5f0c9331cc3434e3113c6eb6b44213b2388afc0d (patch) | |
| tree | 4c7c37d5adf950614b2138ec98b8b148c2c751c1 | |
| parent | 8e1907d61056ea5f16053d88b1411ea0e1027a17 (diff) | |
| parent | 888b791f29506afaad8dbe6cd7e6a925146ab715 (diff) | |
Merge "Make AudioManager.FLAG_FROM_KEY as @SystemApi"
| -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 = { |