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

Merge "Remove ActivityRecords for sandbox activities when App/sandbox died" into udc-dev

Browse Source
This commit is contained in:
Mohammed Rashidy
2023-04-13 17:12:00 +00:00
committed by Android (Google) Code Review
parent f813fcad36 a7b6be8ad6
commit 99d4a174f9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4144,7 +4144,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
*/
void handleAppDied() {
final boolean remove;
if ((mRelaunchReason == RELAUNCH_REASON_WINDOWING_MODE_RESIZE
if (Process.isSdkSandboxUid(getUid())) {
// Sandbox activities are created for SDKs run in the sandbox process, when the sandbox
// process dies, the SDKs are unloaded and can not handle the activity, so sandbox
// activity records should be removed.
remove = true;
} else if ((mRelaunchReason == RELAUNCH_REASON_WINDOWING_MODE_RESIZE
|| mRelaunchReason == RELAUNCH_REASON_FREE_RESIZE)
&& launchCount < 3 && !finishing) {
// If the process crashed during a resize, always try to relaunch it, unless it has