diff options
| author | Felipe Leme <felipeal@google.com> | 2018-05-14 17:51:58 -0700 |
|---|---|---|
| committer | Felipe Leme <felipeal@google.com> | 2018-05-14 18:03:15 -0700 |
| commit | d247de85bb7d36ff5d3d232d6d4d2d3d1eeedec2 (patch) | |
| tree | 573dda4f3b55137c99f7aa4e231e4c7696447662 /core/java/android | |
| parent | 869c6f559ad63e02d699a8e5349cff5069b61129 (diff) | |
Don't call setAutofillClient() on base Context if it's null.
Test: atest CtsAutoFillServiceTestCases
Test: changed activity on autofill sample to override attachBaseContext() by
calling super.attachBaseContext(null) - the activity still crashes, but
not on attachBaseContext().
Fixes: 79707861
Change-Id: Idfaa9c596cc338ab815441138ce06ba64cd3b4d2
Diffstat (limited to 'core/java/android')
| -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 */ |