commit d95cbf18743e9757bace716d6be9f4fdbc2bae59
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 14 14:11:16 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 14:11:16 2024 +0000
tree 8a39fce975dcbe278dfa66b603e5cefb32063167
parent d76a401496704afee15848d0e7db8bd9861fbd9c
parent 47a5bff83aa9d10a1c89802f8c15e2c21694b54f

Merge "Merge "Handle letterbox education when disabled" into 24D1-dev am: 9e78e2afca" into main

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

diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index e2c4b46..cae1695 100644
--- a/services/core/java/com/android/server/audio/SpatializerHelper.java
+++ b/services/core/java/com/android/server/audio/SpatializerHelper.java
@@ -347,9 +347,6 @@
     //------------------------------------------------------
     // routing monitoring
     synchronized void onRoutingUpdated() {
-        if (!mFeatureEnabled) {
-            return;
-        }
         switch (mState) {
             case STATE_UNINITIALIZED:
             case STATE_NOT_SUPPORTED:
@@ -393,7 +390,7 @@
             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);