Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628b95c8 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Do not report config change to activity if nothing changed" into sc-dev am: 592bdb62 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13816978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80c59db4fc0f4c605eae52c1a7c81dbe5521b9c4
parents d4c8dacd 592bdb62

core/java/android/app/ActivityThread.java

+8 −5
Original line number Diff line number Diff line
@@ -5775,11 +5775,14 @@ public final class ActivityThread extends ClientTransactionHandler 
            // ResourcesImpl constructions.

            final int diff = activity.mCurrentConfig.diffPublicOnly(newConfig);



            if (diff == 0 && !shouldUpdateWindowMetricsBounds(activity.mCurrentConfig, newConfig)

                    && !movedToDifferentDisplay && mResourcesManager.isSameResourcesOverrideConfig(

            if (diff == 0) {

                if (!shouldUpdateWindowMetricsBounds(activity.mCurrentConfig, newConfig)

                        && !movedToDifferentDisplay

                        && mResourcesManager.isSameResourcesOverrideConfig(

                                activityToken, amOverrideConfig)) {

                    // Nothing significant, don't proceed with updating and reporting.

                    return null;

                }

            } else if ((~activity.mActivityInfo.getRealConfigChanged() & diff) == 0) {

                // If this activity doesn't handle any of the config changes, then don't bother

                // calling onConfigurationChanged. Otherwise, report to the activity for the