diff options
| author | Felipe Leme <felipeal@google.com> | 2018-05-14 23:09:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-14 23:09:16 -0700 |
| commit | ef2b5b8a9a9a984e8d4ea6ce696916b0ca383155 (patch) | |
| tree | 26839326f128aa47a0bdb29c74e7ffc5a2e9c1c3 /core/java | |
| parent | 0c94c5065d49039a316274780b48af658183e6bd (diff) | |
| parent | aae288a6a5516cb43e6cea253dedd02249ab3983 (diff) | |
Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev am: 6d0842154b
am: aae288a6a5
Change-Id: I8f543b2e8066d8f54baf3bf846de585f8a7631da
Diffstat (limited to 'core/java')
| -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 */ |