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

am: 6d0842154b Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad
2018-05-14 23:01:10 -07:00
parent b098a03e84 6d0842154b
commit aae288a6a5
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 */