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

Commit 1cc7b14c authored by Jackal Guo's avatar Jackal Guo
Browse files

Revert "Mitigate the races during installation." 

This reverts commit e3980139.

Reason for revert: b/214088468. Break device policy test infra.

Change-Id: I7c7f5b91777e7b420b73bdf625800f622b818058
parent e3980139

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -13372,7 +13372,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                        !intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false);

                                final boolean fullUninstall = removed && !replacing;

                                if (removed) {

                                    if (!killProcess) {

                                    if (killProcess) {

                                        forceStopPackageLocked(ssp, UserHandle.getAppId(

                                                intent.getIntExtra(Intent.EXTRA_UID, -1)),

                                                false, true, true, false, fullUninstall, userId,

                                                removed ? "pkg removed" : "pkg changed");

                                    } else {

                                        // Kill any app zygotes always, since they can't fork new

                                        // processes with references to the old code

                                        forceStopAppZygoteLocked(ssp, UserHandle.getAppId(