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

Commit 66726f36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 45a250a2 6db5f864

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

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

        String enabledSurroundFormats = Settings.Global.getString(

                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)) {

            // Update enabled surround formats to AudioPolicyManager only when forceUpdate

            // is true or enabled surround formats changed.