Commit fffd1826 authored Feb 05, 2020 by kwaky

Add null check for voiceInteractorComponentName.

Voice Assistant can be disabled on a user-level. Adding this null check
prevents crash for when Assistant is enabled for the system in general but
disabled for a specific user.

Bug: 149112015
Test: Manual -- Change config_disableLockscreenByDefault to true to
emulate the environment in which Volvo observed the bug. Verify that
switching to user0 through adb shell switch-user 0 causes the same crash.
Verify that the crash does not happen with the new null check.

Change-Id: I5b8ede1e5bd8c1bc047bc6d6220b425dea8f50ea

parent 66660415

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -643,9 +643,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		if (previewBefore != null) {
		mPreviewContainer.removeView(previewBefore);
		}

		if (mLeftIsVoiceAssist) {
		if (Dependency.get(AssistManager.class).getVoiceInteractorComponentName() != null) {
		mLeftPreview = mPreviewInflater.inflatePreviewFromService(
		Dependency.get(AssistManager.class).getVoiceInteractorComponentName());
		}
		} else {
		mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent());
		}