summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-09-17 08:27:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-09-17 08:27:13 +0000
commite569faf5fb2c7faf6d14b2899db66f242043cbb1 (patch)
treec8e6d9ab5abaad6a2464cdb931c3a50ebeacd398
parent30e495d0c4c6516c4cdcb90e722ba909fe28ec9e (diff)
parent298fd2cf7e442626644d6df721be928dc2e76bdd (diff)
Merge "GestureNav: Fix bug in exlcusion limit device config" into qt-qpr1-dev
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index c108752c951a..f67b4fe78f58 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -1167,7 +1167,8 @@ public class WindowManagerService extends IWindowManager.Stub
new HandlerExecutor(mH), properties -> {
synchronized (mGlobalLock) {
final int exclusionLimitDp = Math.max(MIN_GESTURE_EXCLUSION_LIMIT_DP,
- properties.getInt(KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP, 0));
+ DeviceConfig.getInt(DeviceConfig.NAMESPACE_WINDOW_MANAGER,
+ KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP, 0));
final boolean excludedByPreQSticky = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_WINDOW_MANAGER,
KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE, false);