diff --git a/core/java/android/view/translation/UiTranslationController.java b/core/java/android/view/translation/UiTranslationController.java index 357dbc0d1f064..8532763f9dada 100644 --- a/core/java/android/view/translation/UiTranslationController.java +++ b/core/java/android/view/translation/UiTranslationController.java @@ -623,7 +623,7 @@ public class UiTranslationController { private void addViewIfNeeded(IntArray sourceViewIds, View view) { final AutofillId autofillId = view.getAutofillId(); - if ((sourceViewIds.indexOf(autofillId.getViewId()) >= 0) + if (autofillId != null && (sourceViewIds.indexOf(autofillId.getViewId()) >= 0) && !mViews.containsKey(autofillId)) { mViews.put(autofillId, new WeakReference<>(view)); }