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

Commit 424321ce authored by Daniel Sandler's avatar Daniel Sandler Committed by android-build-merger
Browse files

Merge "Fix crash when launching assist from power button." into qt-dev 

am: c74d6b56

Change-Id: I1dc4e70fcb2822ac860c0acae649296f4f5172f6
parents 036acae8 c74d6b56

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,10 @@ public class AssistManager implements ConfigurationChangedReceiver { 
                    ? TIMEOUT_SERVICE

                    : TIMEOUT_ACTIVITY);

        }



        if (args == null) {

            args = new Bundle();

        }

        args.putLong(INVOCATION_TIME_MS_KEY, SystemClock.uptimeMillis());

        startAssistInternal(args, assistComponent, isService);

    }