Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev

2018-05-15 05:47:51 +00:00
parent cc64fb9c8f d247de85bb
commit 6d0842154b
1 changed files with 3 additions and 1 deletions
--- 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 */