commit 9a818444546fb1cb771803f907e9c7a12ba23120
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 29 12:45:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 29 12:45:56 2024 +0000
tree e9159c0539efb7b5f843ef5054c0b99015428d30
parent a40074107d0413f5ba5d1b7480e6526bb8954558
parent 6df9c2f6c41b695c3b9c9ea5a5ee9b6336023370

Merge "Avoid acquiring lock when feature flag is disabled" into main

services/core/java/com/android/server/media/MediaSessionService.java

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index f981d79..3998667 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -665,6 +665,9 @@
     }
 
     private void addUserEngagedSession(MediaSessionRecordImpl mediaSessionRecord) {
+        if (!Flags.enableNotifyingActivityManagerWithMediaSessionStatusChange()) {
+            return;
+        }
         synchronized (mLock) {
             int uid = mediaSessionRecord.getUid();
             mUserEngagedSessionsForFgs.putIfAbsent(uid, new HashSet<>());
@@ -673,6 +676,9 @@
     }
 
     private void removeUserEngagedSession(MediaSessionRecordImpl mediaSessionRecord) {
+        if (!Flags.enableNotifyingActivityManagerWithMediaSessionStatusChange()) {
+            return;
+        }
         synchronized (mLock) {
             int uid = mediaSessionRecord.getUid();
             Set<MediaSessionRecordImpl> mUidUserEngagedSessionsForFgs =