Merge "[Bugfix] Fix the issue where the spatializer available status could not...

Merge "[Bugfix] Fix the issue where the spatializer available status could not be updated" into main

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

@@ -342,9 +342,6 @@ public class SpatializerHelper {
     //------------------------------------------------------
     // routing monitoring
     synchronized void onRoutingUpdated() {
-        if (!mFeatureEnabled) {
-            return;
-        }
         switch (mState) {
             case STATE_UNINITIALIZED:
             case STATE_NOT_SUPPORTED:
@@ -388,7 +385,7 @@ public class SpatializerHelper {
             setDispatchAvailableState(false);
         }
 
-        boolean enabled = able && enabledAvailable.first;
+        boolean enabled = mFeatureEnabled && able && enabledAvailable.first;
         if (enabled) {
             loglogi("Enabling Spatial Audio since enabled for media device:"
                     + currentDevice);