diff options
| author | Rom Lemarchand <romlem@google.com> | 2015-04-04 01:13:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-04 01:13:49 +0000 |
| commit | 5cd2e669252f79e30a7a1e20cb87be1ca1f3ae36 (patch) | |
| tree | 02f2f5f1662c707f6acf0b1d42e1fbd54e3ac42b | |
| parent | 552d56348f0e942d240b8de41581d49cc05113c0 (diff) | |
| parent | b2b292317482d00d067bc91669322b273be61926 (diff) | |
| download | frameworks_base-5cd2e669252f79e30a7a1e20cb87be1ca1f3ae36.zip frameworks_base-5cd2e669252f79e30a7a1e20cb87be1ca1f3ae36.tar.gz frameworks_base-5cd2e669252f79e30a7a1e20cb87be1ca1f3ae36.tar.bz2 | |
Merge "Change audio include path from system/core to system/media/audio"
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/AudioSystem.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 3ab13ee..3c973a2 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -73,7 +73,7 @@ public class AudioFormat { public static final int CHANNEL_OUT_DEFAULT = 1; // Output channel mask definitions below are translated to the native values defined in - // in /system/core/include/system/audio.h in the JNI code of AudioTrack + // in /system/media/audio/include/system/audio.h in the JNI code of AudioTrack public static final int CHANNEL_OUT_FRONT_LEFT = 0x4; public static final int CHANNEL_OUT_FRONT_RIGHT = 0x8; public static final int CHANNEL_OUT_FRONT_CENTER = 0x10; diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 787320e..25e6594 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -123,7 +123,7 @@ public class AudioSystem /** @deprecated */ @Deprecated public static final int ROUTE_ALL = 0xFFFFFFFF; - // Keep in sync with system/core/include/system/audio.h + // Keep in sync with system/media/audio/include/system/audio.h public static final int AUDIO_SESSION_ALLOCATE = 0; /* diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 058cfd2..876aebc 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -171,7 +171,7 @@ public class MediaRecorder public final static int AUDIO_SOURCE_INVALID = -1; /* Do not change these values without updating their counterparts - * in system/core/include/system/audio.h! + * in system/media/audio/include/system/audio.h! */ /** Default audio source **/ |