From 0ea3e2b94a6d236886321d8c0135944373043d9c Mon Sep 17 00:00:00 2001
From: Andy Hung <hunga@google.com>
Date: Thu, 16 Mar 2023 16:32:08 -0700
Subject: [PATCH] AudioService: RotationHelper.forceUpdate fix

All access to RotationHelper from AudioService must
be guarded by a mMonitorRotation if check.

Test: atest VtsHalAudioCoreTargetTest
Bug: 273800157
Change-Id: I3cb4d30efbdab98d078e68a8ac6a85faee2dd8d9
---
 services/core/java/com/android/server/audio/AudioService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 72054fd8c5c0f..ff18167ee86fa 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1731,7 +1731,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