summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2019-08-28 13:19:42 -0700
committer Adrian Roos <roosa@google.com> 2019-09-11 11:16:18 +0000
commit298fd2cf7e442626644d6df721be928dc2e76bdd (patch)
treec68ad8682e4f0e0d8ea436686eb2b0b9ea41d0da
parent667db1bea529fad76a4fc57f58ef1e08b4432f7b (diff)
GestureNav: Fix bug in exlcusion limit device config
Fixes an issue, where the DeviceConfig exclusion limit was reset whenever another key in the android:window_manager namespace changed. Fixes: 140190037 Test: Set limit device config flag to value >200, set unrelated flag, verify limit is still >200. Change-Id: I2df5b6661cc5e545d7c3de38dec5c86e66baea22 Merged-In: I2df5b6661cc5e545d7c3de38dec5c86e66baea22
-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);