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

Commit b705ebf1 authored by jiabin's avatar jiabin Committed by android-build-merger
Browse files

Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am: 66726f36 

am: 065423e5

Change-Id: I03213d3838cf603eec81d008de0f1f09c9a23772
parents f1ef5833 065423e5

services/core/java/com/android/server/audio/AudioService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -1329,6 +1329,11 @@ public class AudioService extends IAudioService.Stub 
        }

        }

        String enabledSurroundFormats = Settings.Global.getString(

        String enabledSurroundFormats = Settings.Global.getString(

                cr, Settings.Global.ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS);

                cr, Settings.Global.ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS);

        if (enabledSurroundFormats == null) {

            // Never allow enabledSurroundFormats as a null, which could happen when

            // ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS is not appear in settings DB.

            enabledSurroundFormats = "";

        }

        if (!forceUpdate && TextUtils.equals(enabledSurroundFormats, mEnabledSurroundFormats)) {

        if (!forceUpdate && TextUtils.equals(enabledSurroundFormats, mEnabledSurroundFormats)) {

            // Update enabled surround formats to AudioPolicyManager only when forceUpdate

            // Update enabled surround formats to AudioPolicyManager only when forceUpdate

            // is true or enabled surround formats changed.

            // is true or enabled surround formats changed.