diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 3b62bd7cb057..7b383d452dbd 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -979,7 +979,9 @@ public class Activity extends ContextThemeWrapper @Override protected void attachBaseContext(Context newBase) { super.attachBaseContext(newBase); - newBase.setAutofillClient(this); + if (newBase != null) { + newBase.setAutofillClient(this); + } } /** @hide */ |