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

Merge "Add null check for voiceInteractorComponentName."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-12 16:24:29 +00:00
committed by Android (Google) Code Review
parent 9d90cfaba0 fffd182650
commit b05882a049
1 changed files with 5 additions and 2 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

@@ -643,9 +643,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
if (previewBefore != null) {
mPreviewContainer.removeView(previewBefore);
}
if (mLeftIsVoiceAssist) {
mLeftPreview = mPreviewInflater.inflatePreviewFromService(
Dependency.get(AssistManager.class).getVoiceInteractorComponentName());
if (Dependency.get(AssistManager.class).getVoiceInteractorComponentName() != null) {
mLeftPreview = mPreviewInflater.inflatePreviewFromService(
Dependency.get(AssistManager.class).getVoiceInteractorComponentName());
}
} else {
mLeftPreview = mPreviewInflater.inflatePreview(mLeftButton.getIntent());
}