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

am: 065423e5b3

Change-Id: I03213d3838cf603eec81d008de0f1f09c9a23772

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

@@ -1329,6 +1329,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.