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." into tm-qpr-dev am: 5b0218abe5

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

Change-Id: I644f5998e0b2eadb4d38e884696f123260a5aa14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Laurent
2022-08-04 12:25:59 +00:00
committed by Automerger Merge Worker
parent 50051d1535 5b0218abe5
commit f689360b69
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -751,33 +751,29 @@ 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();
break; // onRoutingUpdated() can update the "enabled" state based on context
} else { // and will call setDispatchFeatureEnabledState().
// already in disabled state } // else { nothing to do as already disabled }
return; break;
}
case STATE_ENABLED_UNAVAILABLE: case STATE_ENABLED_UNAVAILABLE:
case STATE_ENABLED_AVAILABLE: case STATE_ENABLED_AVAILABLE:
if (!enabled) { if (!enabled) {
releaseSpat(); releaseSpat();
break; setDispatchFeatureEnabledState(false, "setSpatializerEnabledInt");
} else { } // else { nothing to do as already enabled }
// already in enabled state break;
return;
}
} }
setDispatchFeatureEnabledState(enabled, "setSpatializerEnabledInt");
} }
synchronized int getCapableImmersiveAudioLevel() { synchronized int getCapableImmersiveAudioLevel() {