diff options
| author | 2022-01-21 07:00:09 +0000 | |
|---|---|---|
| committer | 2022-01-21 07:00:09 +0000 | |
| commit | f6ed082d5a22512e5d92c438990e7fb973eb6c31 (patch) | |
| tree | 3107d659ef3636a18bad237110edc7ad4df29f84 | |
| parent | 1689c96c28770b735550d147631946a94b9eed68 (diff) | |
| parent | bca4bd6babdad61c84815ca38133990a8ba00fd0 (diff) | |
Merge "Add error handling for onConfigurationChanged" into sc-v2-dev am: bca4bd6bab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16682144
Change-Id: I7acd8a1e3a0543faa1eab52fe030a988a76f5ac6
| -rw-r--r-- | core/java/android/app/Activity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f453ba16043c..750e3d6f6fed 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1537,7 +1537,10 @@ public class Activity extends ContextThemeWrapper } private void dispatchActivityConfigurationChanged() { - getApplication().dispatchActivityConfigurationChanged(this); + // In case the new config comes before mApplication is assigned. + if (getApplication() != null) { + getApplication().dispatchActivityConfigurationChanged(this); + } Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { for (int i = 0; i < callbacks.length; i++) { |