Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioSystem: fix "keep in sync" comments" am: c1370378c7

Browse Source 
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>
This commit is contained in:
Jean-Michel Trivi
2023-03-30 17:10:31 +00:00
committed by Automerger Merge Worker
parent 23afbe95eb c1370378c7
commit 51ea8de9bf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/AudioSystem.java
View File

@@ -72,7 +72,7 @@ public class AudioSystem
throw new UnsupportedOperationException("Trying to instantiate 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 * If these are modified, please also update Settings.System.VOLUME_SETTINGS
* and attrs.xml and AudioManager.java. * 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 */ /** @hide */
public static final int DEVICE_NONE = 0x0; public static final int DEVICE_NONE = 0x0;