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

Commit d445aaf1 authored by kwaky's avatar kwaky
Browse files

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
Merged-in: I5b8ede1e5bd8c1bc047bc6d6220b425dea8f50ea
parent c1e78426

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

+4 −3
Original line number Diff line number Diff line
@@ -641,9 +641,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        if (previewBefore != null) {

            mPreviewContainer.removeView(previewBefore);

        }

        if (mLeftIsVoiceAssist) {

            mLeftPreview = mPreviewInflater.inflatePreviewFromService(

                    mAssistManager.getVoiceInteractorComponentName());

        ComponentName voiceInteractorComponentName =

                mAssistManager.getVoiceInteractorComponentName();

        if (mLeftIsVoiceAssist && voiceInteractorComponentName != null) {

            mLeftPreview = mPreviewInflater.inflatePreviewFromService(voiceInteractorComponentName);

        } else {

            mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent());

        }