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

Commit 6db5f864 authored by jiabin's avatar jiabin
Browse files

Set enabledSurroundFormats as empty string when it is null. 

When ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS doesn't exist in settings
DB, enabledSurroundFormats will be null. Set it as empty string to avoid
crash.

Bug: 79923672
Test: Delete ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS and select manual.
Change-Id: I8385bc05733ebd8ca0b64e756cf22fc8e3de09c8
parent e9e5cb3f

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -1320,6 +1320,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.