Merge "AudioService: fix initial spatial audio enable state." (4dc6c54d) · Commits · e / os / android_frameworks_base

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

+9 −13

Original line number	Diff line number	Diff line
		@@ -748,33 +748,29 @@ public class SpatializerHelper {
		if (enabled) {
		throw (new IllegalStateException("Can't enable when uninitialized"));
		}
		return;
		break;
		case STATE_NOT_SUPPORTED:
		if (enabled) {
		Log.e(TAG, "Can't enable when unsupported");
		}
		return;
		break;
		case STATE_DISABLED_UNAVAILABLE:
		case STATE_DISABLED_AVAILABLE:
		if (enabled) {
		createSpat();
		onRoutingUpdated();
		// onRoutingUpdated() can update the "enabled" state based on context
		// and will call setDispatchFeatureEnabledState().
		} // else { nothing to do as already disabled }
		break;
		} else {
		// already in disabled state
		return;
		}
		case STATE_ENABLED_UNAVAILABLE:
		case STATE_ENABLED_AVAILABLE:
		if (!enabled) {
		releaseSpat();
		setDispatchFeatureEnabledState(false, "setSpatializerEnabledInt");
		} // else { nothing to do as already enabled }
		break;
		} else {
		// already in enabled state
		return;
		}
		}
		setDispatchFeatureEnabledState(enabled, "setSpatializerEnabledInt");
		}

		synchronized int getCapableImmersiveAudioLevel() {