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

Commit 512485ad authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Remove process association if it is known to be dead" into tm-dev

parents 9a373389 221c72de

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -954,7 +954,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
                // This is the first time we failed -- restart process and

                // This is the first time we failed -- restart process and

                // retry.

                // retry.

                r.launchFailed = true;

                r.launchFailed = true;

                proc.removeActivity(r, true /* keepAssociation */);

                r.detachFromProcess();

                throw e;

                throw e;

            }

            }

        } finally {

        } finally {
@@ -1046,6 +1046,9 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
            // If a dead object exception was thrown -- fall through to

            // If a dead object exception was thrown -- fall through to

            // restart the application.

            // restart the application.

            knownToBeDead = true;

            knownToBeDead = true;

            // Remove the process record so it won't be considered as alive.

            mService.mProcessNames.remove(wpc.mName, wpc.mUid);

            mService.mProcessMap.remove(wpc.getPid());

        }

        }





        r.notifyUnknownVisibilityLaunchedForKeyguardTransition();

        r.notifyUnknownVisibilityLaunchedForKeyguardTransition();