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
This commit is contained in:
Chilun Huang
2022-01-21 07:00:09 +00:00
committed by Automerger Merge Worker

View File

@@ -1537,7 +1537,10 @@ public class Activity extends ContextThemeWrapper
} }
private void dispatchActivityConfigurationChanged() { private void dispatchActivityConfigurationChanged() {
// In case the new config comes before mApplication is assigned.
if (getApplication() != null) {
getApplication().dispatchActivityConfigurationChanged(this); getApplication().dispatchActivityConfigurationChanged(this);
}
Object[] callbacks = collectActivityLifecycleCallbacks(); Object[] callbacks = collectActivityLifecycleCallbacks();
if (callbacks != null) { if (callbacks != null) {
for (int i = 0; i < callbacks.length; i++) { for (int i = 0; i < callbacks.length; i++) {