diff options
| author | Charles Chen <charlesccchen@google.com> | 2020-07-08 18:01:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 18:01:31 +0000 |
| commit | 4020effc37255636935ab9bc76e8fc02b1870cea (patch) | |
| tree | 60e418f1d9323610038f58bdf65d30cce6131f48 /core/java/android/content/ContextWrapper.java | |
| parent | 204b3b8e53657f16ca3a88f7e393eec9c60d573f (diff) | |
| parent | 5c25605da050660009d6a4b0dbf13061249dc821 (diff) | |
Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605da0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105622
Change-Id: Ib39a4f20c7cd1ca0bc928b22c7c29a5592fbf6ff
Diffstat (limited to 'core/java/android/content/ContextWrapper.java')
| -rw-r--r-- | core/java/android/content/ContextWrapper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 5dc41e483640..89abfc95d634 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -1151,6 +1151,9 @@ public class ContextWrapper extends Context { */ @Override public boolean isUiContext() { + if (mBase == null) { + return false; + } return mBase.isUiContext(); } } |