commit a4785c9a3fa40b8727b31873364687beb5a4149c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 18:08:00 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 18:08:00 2018 +0000
tree d5192edf1f08e4f19812c750c4f69f1213ca0b5c
parent 34838cf551cdc9b948a144ddadfc0d6117096d63
parent aa168d5c112f2752abaa8f560b63a05e1f45d592

[automerger] Do not execute controller callbacks, if controller is null am: aa168d5c11

Change-Id: I00471a292a30f1a500a36007486e68035380e4ac

quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java

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();
         }