From a12a816a911be799c3f12ffc528cc46faf886c59 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 14 Sep 2021 07:26:41 -0700
Subject: [PATCH] AudioService Spatializer: disable by default

Also release the spatializer used for checking level.

Bug: 188502620
Test: adb logcat | grep Spatializer, check for no spat init messages
Change-Id: I858661f206ae04b9bf7d8c9f2857e9028addd2c7
---
 .../java/com/android/server/audio/AudioService.java    |  5 +++--
 .../com/android/server/audio/SpatializerHelper.java    | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index f2ba42c6ceeaa..b230200d0d7d6 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1431,7 +1431,7 @@ public class AudioService extends IAudioService.Stub
         }
 
         // TODO check property if feature enabled
-        mSpatializerHelper.reset(/* featureEnabled */ true);
+        mSpatializerHelper.reset(/* featureEnabled */ SPATIALIZER_FEATURE_ENABLED_DEFAULT);
 
         onIndicateSystemReady();
         // indicate the end of reconfiguration phase to audio HAL
@@ -7569,7 +7569,7 @@ public class AudioService extends IAudioService.Stub
                 case MSG_INIT_SPATIALIZER:
                     mSpatializerHelper.init();
                     // TODO read property to see if enabled
-                    mSpatializerHelper.setFeatureEnabled(true);
+                    mSpatializerHelper.setFeatureEnabled(SPATIALIZER_FEATURE_ENABLED_DEFAULT);
                     mAudioEventWakeLock.release();
                     break;
 
@@ -8278,6 +8278,7 @@ public class AudioService extends IAudioService.Stub
 
     //==========================================================================================
     private final @NonNull SpatializerHelper mSpatializerHelper;
+    private static final boolean SPATIALIZER_FEATURE_ENABLED_DEFAULT = false;
 
     private void enforceModifyDefaultAudioEffectsPermission() {
         if (mContext.checkCallingOrSelfPermission(
diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index 2ca100c910438..32ac7859fbe69 100644
--- a/services/core/java/com/android/server/audio/SpatializerHelper.java
+++ b/services/core/java/com/android/server/audio/SpatializerHelper.java
@@ -124,7 +124,15 @@ public class SpatializerHelper {
                     break;
                 }
             }
-        } catch (RemoteException e) { /* capable level remains at NONE*/ }
+        } catch (RemoteException e) {
+            /* capable level remains at NONE*/
+        } finally {
+            if (spat != null) {
+                try {
+                    spat.release();
+                } catch (RemoteException e) { /* capable level remains at NONE*/ }
+            }
+        }
         if (mCapableSpatLevel == Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE) {
             mState = STATE_NOT_SUPPORTED;
             return;