commit 10a46078a7ffff8d60c1b2af9695e3180495db45
author Anna Wasewicz <awasewicz@google.com> Wed Jul 17 15:16:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 17 15:16:24 2019 -0700
tree ba7679f21f9f71e28d9d1e5f31a83d3803bf9e55
parent 4afb35013465e1952d6648a1352852629a132ca0
parent 3c5c17f0cad484371d49ab7387079fc9b5a21dbb

Merge "Set the chips flag to false in QP1A. This flag should be off by default. Chips should not be running in QP1A. Bug:137290162 am: 31d0a9c562 am: e47e525026" into qt-r1-dev-plus-aosp
am: 3c5c17f0ca

Change-Id: I2dcf53831622a90d5293b45335b15adfa61d8b24

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index bf9d531..573fdcc 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -697,6 +697,10 @@
         if (!mIsUserUnlocked) {
             return;
         }
+        if (!mMode.hasGestures && !mOverviewComponentObserver.isHomeAndOverviewSame()) {
+            // Prevent the overview from being started before the real home on first boot.
+            return;
+        }
 
         final ActivityControlHelper<BaseDraggingActivity> activityControl =
                 mOverviewComponentObserver.getActivityControlHelper();