summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andy Hung <hunga@google.com> 2023-03-21 17:54:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-21 17:54:35 +0000
commit19113c77189cfafb218b65c710877fc68a0460be (patch)
tree934e1fb9ead5c3f4dc6671444b450d8a37c81023
parent1f39eadc663d8160e99bd1fb356ef9f7c94d4b9c (diff)
parent5737af43c87bfbf2634ff8d80a06e24713608068 (diff)
Merge changes from topic "spatializer_device_state_update" am: 5737af43c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2498716 Change-Id: Ie0f8b3ddf721a5ad6cb45ca3ee28fdd4a388caf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 3b90a8a0274d..5ca03b8e6f8b 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1692,7 +1692,9 @@ public class AudioService extends IAudioService.Stub
mSpatializerHelper.reset(/* featureEnabled */ mHasSpatializerEffect);
// Restore rotation information.
- RotationHelper.forceUpdate();
+ if (mMonitorRotation) {
+ RotationHelper.forceUpdate();
+ }
onIndicateSystemReady();
// indicate the end of reconfiguration phase to audio HAL