summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2023-03-30 17:10:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-30 17:10:31 +0000
commit51ea8de9bfa42e5f7da040ed3ce72a60331cb2c8 (patch)
tree8a449caca04756e8b5bb8979d432b9c5e754524d
parent23afbe95ebc9398e906ffb98832eaefabf58ddd5 (diff)
parentc1370378c746c8dcc3e04b3069909e41dbf30adb (diff)
Merge "AudioSystem: fix "keep in sync" comments" am: c1370378c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2514015 Change-Id: Ic383508234e16c5c3f0e05d87b3918c53b6e012e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/java/android/media/AudioSystem.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 22033c6d8401..6b29fc319c6b 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -72,7 +72,7 @@ public class AudioSystem
throw new UnsupportedOperationException("Trying to instantiate AudioSystem");
}
- /* These values must be kept in sync with system/audio.h */
+ /* These values must be kept in sync with system/media/audio/include/system/audio-hal-enums.h */
/*
* If these are modified, please also update Settings.System.VOLUME_SETTINGS
* and attrs.xml and AudioManager.java.
@@ -963,7 +963,8 @@ public class AudioSystem
*/
//
- // audio device definitions: must be kept in sync with values in system/core/audio.h
+ // audio device definitions: must be kept in sync with values
+ // in system/media/audio/include/system/audio-hal-enums.h
//
/** @hide */
public static final int DEVICE_NONE = 0x0;