commit a8eda90c95ffb591f74e733395c2e11c7f55993e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 18:08:01 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 18:08:01 2018 +0000
tree feb293f859cf64077e7d0db86e08497cf12f1928
parent ea15d92bad38e164590d472d6cbde8783e35876f
parent a4785c9a3fa40b8727b31873364687beb5a4149c

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

Change-Id: I7445f1f572a0e07a5356f65c9abe65ca90fc7d52

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