commit d76a401496704afee15848d0e7db8bd9861fbd9c
author Jean-Michel Trivi <jmtrivi@google.com> Tue May 14 14:10:06 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 14 14:10:06 2024 +0000
tree beb6ed1a2fdf3c0e545a7016e669e3b0c7957515
parent 24520fd5204d964df9394da9e2b2fc20495a4d30
parent b72a4128dc028ad527526c533f87ab5604cb3673

Merge "[Bugfix] Fix the issue where the spatializer available status could not be updated" into main am: 07f66cf413 am: b72a4128dc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3074148

Change-Id: Ia72032f4b7ea18f28dcf934dc17700c17a6272b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);