Merge "Fix fingerprint swipe gesture settings for secondary users." into nyc-mr1-dev

2016-08-10 17:08:12 +00:00
parent d4a95806ab 34331b7ca9
commit fc5efaeabc
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -7319,8 +7319,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
    }

    private boolean areSystemNavigationKeysEnabled() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0) == 1;
+        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0, UserHandle.USER_CURRENT) == 1;
    }

    @Override