summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Puneet Kumar <puneetster@google.com> 2015-10-24 15:20:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-10-24 15:20:28 +0000
commitca9c43b27b9e3bc007e731fe3a214cbed3edf8f3 (patch)
tree34770dcdfc49f815054de2599cfa0d65a68334cf
parent493272c8a7e7219f947a222cd71aaaf3d4bc3c0a (diff)
parentd847ad55554986d4312e100a8993994ed33edbfa (diff)
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 495346af19e7..0d96ca6a406a 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2994,7 +2994,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Display task switcher for ALT-TAB.
if (down && repeatCount == 0 && keyCode == KeyEvent.KEYCODE_TAB) {
- if (mRecentAppsHeldModifiers == 0 && !keyguardOn) {
+ if (mRecentAppsHeldModifiers == 0 && !keyguardOn && isUserSetupComplete()) {
final int shiftlessModifiers = event.getModifiers() & ~KeyEvent.META_SHIFT_MASK;
if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)) {
mRecentAppsHeldModifiers = shiftlessModifiers;