Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13e63f84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix null check in invocation logging"

parents e2d322ef b6519c0c

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

            }