Merge "AudioService Spatializer: disable by default" into sc-v2-dev (a809ca14) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -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(

+9 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,15 @@ public class SpatializerHelper {
		break;
		}
		}
		} 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;