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

Commit 04f1bff0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "AudioSystem: fix "keep in sync" comments" am: c1370378 am: 51ea8de9... 

Merge "AudioSystem: fix "keep in sync" comments" am: c1370378 am: 51ea8de9 am: 541f1e2e am: d154307d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2514015



Change-Id: Ib04b00fb62d9c78e61f1cafb44eed578f84f19e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d6ab034 d154307d

media/java/android/media/AudioSystem.java

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