Merge "Add error handling for onConfigurationChanged" into sc-v2-dev

2022-01-21 06:45:10 +00:00
parent f450642f4f cca803cba8
commit bca4bd6bab
1 changed files with 4 additions and 1 deletions
--- 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++) {