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

Merge "Apply pending AppInfo on Activity override change" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-12 23:46:03 +00:00
committed by Android (Google) Code Review
parent f59bf68628 290e51fce3
commit d2dd630204
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ResourcesManager.java
View File

@@ -1158,9 +1158,15 @@ public class ResourcesManager {
} else { } else {
activityResources.overrideConfig.unset(); activityResources.overrideConfig.unset();
} }
// Update the Activity's override display id. // Update the Activity's override display id.
activityResources.overrideDisplayId = displayId; activityResources.overrideDisplayId = displayId;
// If a application info update was scheduled to occur in this process but has not
// occurred yet, apply it now so the resources objects will have updated paths if
// the assets sequence changed.
applyAllPendingAppInfoUpdates();
if (DEBUG) { if (DEBUG) {
Throwable here = new Throwable(); Throwable here = new Throwable();
here.fillInStackTrace(); here.fillInStackTrace();