Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd2e669 authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Android (Google) Code Review
Browse files

Merge "Change audio include path from system/core to system/media/audio"

parents 552d5634 b2b29231

media/java/android/media/AudioFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/java/android/media/AudioSystem.java

+1 −1
Original line number Diff line number Diff line
@@ -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;



    /*

media/java/android/media/MediaRecorder.java

+1 −1
Original line number Diff line number Diff line
@@ -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 **/