commit c31c3a280790ee7bbd1f5274661946e7b7b94de1
author Riddle Hsu <riddlehsu@google.com> Mon Dec 14 16:59:15 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 14 16:59:15 2020 +0000
tree cc81d2b2b474e031e4a96a2dbb74d3c5e5311388
parent 74f5161e3d1fdc4257325f67eed18349fb6841b2
parent 0e08c81e9858174374bac651e0d8923df3cb21e8

Merge "Remove lock of getLockTaskModeState"

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 791d74a..a2b0990 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2538,9 +2538,7 @@
 
     @Override
     public int getLockTaskModeState() {
-        synchronized (mGlobalLock) {
-            return getLockTaskController().getLockTaskModeState();
-        }
+        return getLockTaskController().getLockTaskModeState();
     }
 
     @Override