diff options
| author | 2018-05-15 05:47:51 +0000 | |
|---|---|---|
| committer | 2018-05-15 05:47:51 +0000 | |
| commit | 6d0842154bb063632f937ef360557af281b6c2cb (patch) | |
| tree | bf96522082a53640ab058c25c3135e00bb5e1636 | |
| parent | cc64fb9c8f441d18f611643d8dc212b8dfe0c081 (diff) | |
| parent | d247de85bb7d36ff5d3d232d6d4d2d3d1eeedec2 (diff) | |
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev
| -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 */ |