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

Merge "Fix NPE caused by config change on a destroyed activity" into sc-v2-dev am: ee37f56c37 am: c02fca0481

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

Change-Id: I63f8dc5124f8f25ff54e4e7d147e21eb03586b82
This commit is contained in:
Riddle Hsu
2021-07-06 12:33:22 +00:00
committed by Automerger Merge Worker
parent 64764ecdbe c02fca0481
commit e38a9044d4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5430,6 +5430,12 @@ public final class ActivityThread extends ClientTransactionHandler
// behave properly when activity is relaunching.
r.window.clearContentView();
} else {
final ViewRootImpl viewRoot = v.getViewRootImpl();
if (viewRoot != null) {
// Clear the callback to avoid the destroyed activity from receiving
// configuration changes that are no longer effective.
viewRoot.setActivityConfigCallback(null);
}
wm.removeViewImmediate(v);
}
}
@@ -5834,10 +5840,9 @@ public final class ActivityThread extends ClientTransactionHandler
final boolean movedToDifferentDisplay = isDifferentDisplay(activity.getDisplayId(),
displayId);
final SizeConfigurationBuckets buckets = getActivityClient(activityToken)
.mSizeConfigurations;
final ActivityClientRecord r = mActivities.get(activityToken);
final int diff = diffPublicWithSizeBuckets(activity.mCurrentConfig,
newConfig, buckets);
newConfig, r != null ? r.mSizeConfigurations : null);
final boolean hasPublicConfigChange = diff != 0;
// TODO(b/173090263): Use diff instead after the improvement of AssetManager and
// ResourcesImpl constructions.