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

Commit 8e1a5fec authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Removing the list of formats from the javadoc in... 

Merge "Removing the list of formats from the javadoc in setSurroundFormatEnabled" into sc-dev am: e5489584

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

Change-Id: I1cacf34fef614e87d4aa85159b3854209c2c1e36
parents 4f7bd130 e5489584

media/java/android/media/AudioManager.java

+1 −9
Original line number Diff line number Diff line
@@ -7068,15 +7068,7 @@ public class AudioManager { 


    /**

     * Set a certain surround format as enabled or not.

     * @param audioFormat a surround format, the value is one of

     *        {@link AudioFormat#ENCODING_AC3}, {@link AudioFormat#ENCODING_E_AC3},

     *        {@link AudioFormat#ENCODING_DTS}, {@link AudioFormat#ENCODING_DTS_HD},

     *        {@link AudioFormat#ENCODING_AAC_LC}, {@link AudioFormat#ENCODING_DOLBY_TRUEHD},

     *        {@link AudioFormat#ENCODING_E_AC3_JOC}. Once {@link AudioFormat#ENCODING_AAC_LC} is

     *        set as enabled, {@link AudioFormat#ENCODING_AAC_LC},

     *        {@link AudioFormat#ENCODING_AAC_HE_V1}, {@link AudioFormat#ENCODING_AAC_HE_V2},

     *        {@link AudioFormat#ENCODING_AAC_ELD}, {@link AudioFormat#ENCODING_AAC_XHE} are

     *        all enabled.

     *

     * @param enabled the required surround format state, true for enabled, false for disabled

     * @return true if successful, otherwise false

     */