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

Commit 80d6f30a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add null check for voiceInteractorComponentName." into qt-qpr1-dev am: 718b4fd9 

Change-Id: I60936954d102a3d9557f2a01c9b70c333c1e4c4b
parents 8a175acf 718b4fd9

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

        }