Merge changes from topic "am-b4ccc74b-9fac-466f-997f-63416774e49c" into ub-launcher3-edmonton-polish
* changes:
[automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11
Do not execute controller callbacks, if controller is null
diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index 34d42ac..b0313fc 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -49,6 +49,9 @@
this.mController = controller;
this.targetSet = targetSet;
+ if (controller == null) {
+ return;
+ }
if (mInputConsumerEnabled) {
enableInputConsumer();
}