commit 6d1b7c53dff57c2061291545bd9a56067763ec23
author Arthur Hung <arthurhung@google.com> Tue Jan 21 18:35:14 2020 +0800
committer Arthur Hung <arthurhung@google.com> Fri Jan 31 14:32:15 2020 +0800
tree 625203846e1d3e1bb9ba448eec3d642041eb3c32
parent 1605af297d4ab67439b2e751c55b33f7ad5515c1

Fix InTouchMode is not consistent between WMS and InputFlinger

Use getInTouchMode/setInTouchMode to access InTouchMode in WMS.

Test: atest TouchModeFocusChangeTest
Bug: 148002313
Change-Id: Iebea007f638624706ed91b6c17dcc73506d779ac

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

diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java
index de7f9e4..ab1f34a 100644
--- a/services/core/java/com/android/server/wm/Session.java
+++ b/services/core/java/com/android/server/wm/Session.java
@@ -238,16 +238,12 @@
 
     @Override
     public void setInTouchMode(boolean mode) {
-        synchronized (mService.mGlobalLock) {
-            mService.mInTouchMode = mode;
-        }
+        mService.setInTouchMode(mode);
     }
 
     @Override
     public boolean getInTouchMode() {
-        synchronized (mService.mGlobalLock) {
-            return mService.mInTouchMode;
-        }
+        return mService.getInTouchMode();
     }
 
     @Override