Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-b4bd5ce7b4f34be08b452106d0393ce8" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Audio: SpatializerHelper: fix native audio server death handling 2p: 99c61c6bd1
  Audio: SpatializerHelper: fix native audio server death handling
This commit is contained in:
Eric Laurent
2022-03-15 19:18:06 +00:00
committed by Android (Google) Code Review
parent 21f246ac1c 195aecd962
commit a0b428bbb7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/audio/SpatializerHelper.java
View File

@@ -176,6 +176,7 @@ public class SpatializerHelper {
*/ */
synchronized void reset(boolean featureEnabled) { synchronized void reset(boolean featureEnabled) {
Log.i(TAG, "Resetting"); Log.i(TAG, "Resetting");
releaseSpat();
mState = STATE_UNINITIALIZED; mState = STATE_UNINITIALIZED;
mSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE; mSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;
mCapableSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE; mCapableSpatLevel = Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;
@@ -517,10 +518,10 @@ public class SpatializerHelper {
try { try {
mSpat.registerHeadTrackingCallback(null); mSpat.registerHeadTrackingCallback(null);
mSpat.release(); mSpat.release();
mSpat = null;
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Can't set release spatializer cleanly", e); Log.e(TAG, "Can't set release spatializer cleanly", e);
} }
mSpat = null;
} }
} }