Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I60936954d102a3d9557f2a01c9b70c333c1e4c4b
This commit is contained in:
Automerger Merge Worker
2020-02-12 18:42:23 +00:00
parent 8a175acf37 718b4fd970
commit 80d6f30aec
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,9 +641,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
if (previewBefore != null) { if (previewBefore != null) {
mPreviewContainer.removeView(previewBefore); mPreviewContainer.removeView(previewBefore);
} }
if (mLeftIsVoiceAssist) { ComponentName voiceInteractorComponentName =
mLeftPreview = mPreviewInflater.inflatePreviewFromService( mAssistManager.getVoiceInteractorComponentName();
mAssistManager.getVoiceInteractorComponentName()); if (mLeftIsVoiceAssist && voiceInteractorComponentName != null) {
mLeftPreview = mPreviewInflater.inflatePreviewFromService(voiceInteractorComponentName);
} else { } else {
mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent()); mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent());
} }