diff options
| author | 2023-03-30 19:11:13 +0000 | |
|---|---|---|
| committer | 2023-03-30 19:11:13 +0000 | |
| commit | d154307db942e024c8457a4f5e0a433bcb6d223e (patch) | |
| tree | e7a2e5ec795ce412a60f87815fa0b4740789baa1 | |
| parent | c071fd8420911e689936518f6adae72f2a49e84f (diff) | |
| parent | 541f1e2e7b82d279941a8ef21b5cae2aed65d030 (diff) | |
Merge "AudioSystem: fix "keep in sync" comments" am: c1370378c7 am: 51ea8de9bf am: 541f1e2e7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2514015
Change-Id: I70426d33772ec844079d3791eb6be2dc3eed19ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/java/android/media/AudioSystem.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 293d3d2861cd..e73cf87ba9f3 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -70,7 +70,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. @@ -961,7 +961,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; |