Merge "AudioService: fix initial spatial audio enable state." into tm-qpr-dev

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

@@ -751,34 +751,30 @@ public class SpatializerHelper {
                 if (enabled) {
                     throw (new IllegalStateException("Can't enable when uninitialized"));
                 }
-                return;
+                break;
             case STATE_NOT_SUPPORTED:
                 if (enabled) {
                     Log.e(TAG, "Can't enable when unsupported");
                 }
-                return;
+                break;
             case STATE_DISABLED_UNAVAILABLE:
             case STATE_DISABLED_AVAILABLE:
                 if (enabled) {
                     createSpat();
                     onRoutingUpdated();
+                    // onRoutingUpdated() can update the "enabled" state based on context
+                    // and will call setDispatchFeatureEnabledState().
+                } // else { nothing to do as already disabled }
                 break;
-                } else {
-                    // already in disabled state
-                    return;
-                }
             case STATE_ENABLED_UNAVAILABLE:
             case STATE_ENABLED_AVAILABLE:
                 if (!enabled) {
                     releaseSpat();
+                    setDispatchFeatureEnabledState(false, "setSpatializerEnabledInt");
+                } // else { nothing to do as already enabled }
                 break;
-                } else {
-                    // already in enabled state
-                    return;
         }
     }
-        setDispatchFeatureEnabledState(enabled, "setSpatializerEnabledInt");
-    }
 
     synchronized int getCapableImmersiveAudioLevel() {
         return mCapableSpatLevel;