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

Commit ee88746b authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie0909bcc5032fcbfe1abb22f61607629167f908e
parents 877ff3dc 512485ad

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

+4 −1
Original line number 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

                // retry.

                r.launchFailed = true;

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

                r.detachFromProcess();

                throw e;

            }

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

            // restart the application.

            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();