commit 4aa1e48a71df78fed20ac4105a2bd97ff04addf7
author Michael Wright <michaelwr@google.com> Tue Nov 17 18:33:38 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 18:33:38 2015 +0000
tree 04c1987630ea8f2d04dd044ee3bd366b031bd6ae
parent abea6dc466cbd01be261192f8dbc083b58661bad
parent 333db2e12238997a3c0984f7ad0dc2f852b58eb9

Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 489bcdb..7a84698 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2968,7 +2968,7 @@
 
         // 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;