summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-10-24 13:24:15 +0100
committerMichael Wright <michaelwr@google.com>2015-10-24 13:24:15 +0100
commitd847ad55554986d4312e100a8993994ed33edbfa (patch)
treeaa14257c6f64fadbd6d7884a771f1840173ae61d /services/core
parent09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24 (diff)
downloadframeworks_base-d847ad55554986d4312e100a8993994ed33edbfa.zip
frameworks_base-d847ad55554986d4312e100a8993994ed33edbfa.tar.gz
frameworks_base-d847ad55554986d4312e100a8993994ed33edbfa.tar.bz2
Prevent recents from coming up when in SUW
Bug: 25229538 Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
Diffstat (limited to 'services/core')
-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 495346a..0d96ca6 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;