diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 6c79c1a3a1c76..7c9a3ae260f4e 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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.