From 0e08c81e9858174374bac651e0d8923df3cb21e8 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Fri, 11 Dec 2020 22:08:29 +0800 Subject: [PATCH] Remove lock of getLockTaskModeState The state field is declared as volatile. And the field is always written on display thread without lock. So it is unnecessary to lock the getter method. Bug: 173467481 Test: CtsWindowManagerDeviceTestCases Change-Id: I6324f6745fd849438b7b0d326bd63bd2d0580421 --- .../com/android/server/wm/ActivityTaskManagerService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 791d74afebdda..a2b09908e22d9 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 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public int getLockTaskModeState() { - synchronized (mGlobalLock) { - return getLockTaskController().getLockTaskModeState(); - } + return getLockTaskController().getLockTaskModeState(); } @Override