Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Riddle Hsu
2021-03-11 12:25:03 +00:00
committed by Android (Google) Code Review
parent 36a45cf022 5b9845ad38
commit 592bdb62b8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ActivityThread.java
View File

@@ -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(
activityToken, amOverrideConfig)) {
// Nothing significant, don't proceed with updating and reporting.
return null;
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