diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java index bf81e1d3b7f1..9958124a14e4 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java @@ -152,7 +152,8 @@ public class DefaultUiController implements AssistManager.UiController { .setSubtype(Dependency.get(AssistManager.class).toLoggingSubType(type))); } // Logs assistant invocation cancelled. - if (!mInvocationAnimator.isRunning() && invocationWasInProgress && progress == 0f) { + if ((mInvocationAnimator == null || !mInvocationAnimator.isRunning()) + && invocationWasInProgress && progress == 0f) { if (VERBOSE) { Log.v(TAG, "Invocation cancelled: type=" + type); } |