summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-06-07 20:57:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-06-07 20:57:41 +0000
commit9df4597f043b3d22b7e5288d622b99824556a491 (patch)
tree7ac90761749fd8dc877d653d5092a8e895a77465
parenta04c779f86692d1b2da095af41c279a5d841e664 (diff)
parentaa168d5c112f2752abaa8f560b63a05e1f45d592 (diff)
downloadandroid_packages_apps_Trebuchet-9df4597f043b3d22b7e5288d622b99824556a491.tar.gz
android_packages_apps_Trebuchet-9df4597f043b3d22b7e5288d622b99824556a491.tar.bz2
android_packages_apps_Trebuchet-9df4597f043b3d22b7e5288d622b99824556a491.zip
Merge "Do not execute controller callbacks, if controller is null" into ub-launcher3-edmonton
-rw-r--r--quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index 34d42ac92..b0313fc2b 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -49,6 +49,9 @@ public class RecentsAnimationWrapper {
this.mController = controller;
this.targetSet = targetSet;
+ if (controller == null) {
+ return;
+ }
if (mInputConsumerEnabled) {
enableInputConsumer();
}