Merge "Fix crash when launching assist from power button." into qt-dev (c74d6b56) · Commits · e / os / android_frameworks_base

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