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

Merge "AudioService: fix initial spatial audio enable state." am: 4dc6c54ddf am: 0f4427871d am: 72f5ab8a02

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

Change-Id: Iffd18f35f5144ecbd8d547e322ed695f7f06c683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2022-09-08 19:08:39 +00:00
committed by Automerger Merge Worker
parent 5fc8a5a576 72f5ab8a02
commit 5e98cd45e5
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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