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

Commit a9b535f8 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

Fix inconsistent behavior of killPackageDependents. 

ActivityManagerService.killPackageDependents behaved inconsistently when
used with USER_ALL vs a specific user id. In both cases, processes that
have added a dependency on the specified package via
addPackageDependency were killed as expected, but processes owned by the
specified package were only being killed when a specific user id was
used, and were left alone when USER_ALL was specified.

Fix this by looping over all the users as other similar process-killing
methods do, instead of relying on a single call to
killPackageProcessesLSP.

This also adds proper usage of UserController.handleIncomingUser, making
it possible to use the API with USER_CURRENT. Killing dependents for all
users now requires INTERACT_ACROSS_USERS_FULL to be consistent with
other similar APIs - previously no permission other than KILL_UID was
required.

Bug: 310653407
Test: atest CtsAppTestCases:PackageDependencyTest
Flag: EXEMPT bugfix
Change-Id: I7a95758bab4fa2c8b33d5c6748a614848c9d8d9a
parent af00cc73

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

+26 −17
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ import com.android.internal.util.FastPrintWriter; 
import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.MemInfoReader;

import com.android.internal.util.Preconditions;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.AlarmManagerInternal;

import com.android.server.BootReceiver;

import com.android.server.DeviceIdleInternal;
@@ -438,6 +437,7 @@ import com.android.server.am.LowMemDetector.MemFactor; 
import com.android.server.appop.AppOpsService;

import com.android.server.compat.PlatformCompat;

import com.android.server.contentcapture.ContentCaptureManagerInternal;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.firewall.IntentFirewall;

import com.android.server.graphics.fonts.FontManagerInternal;
@@ -18376,27 +18376,36 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    "Cannot kill the dependents of a package without its name.");

        }













        userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),













                userId, true, ALLOW_FULL_ONLY, "killPackageDependents", null);













        final int[] userIds = mUserController.expandUserId(userId);



























        final long callingId = Binder.clearCallingIdentity();















        IPackageManager pm = AppGlobals.getPackageManager();













        try {













            for (int targetUserId : userIds) {















                int pkgUid = -1;















                try {













            pkgUid = pm.getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING, userId);













                    pkgUid = pm.getPackageUid(packageName, MATCH_DEBUG_TRIAGED_MISSING,













                            targetUserId);















                } catch (RemoteException e) {















                }















                if (userId != UserHandle.USER_ALL && pkgUid == -1) {















                    throw new IllegalArgumentException(















                            "Cannot kill dependents of non-existing package " + packageName);















                }













        try {















                synchronized (this) {















                    synchronized (mProcLock) {













                    mProcessList.killPackageProcessesLSP(packageName, UserHandle.getAppId(pkgUid),













                            userId, ProcessList.FOREGROUND_APP_ADJ,













                        mProcessList.killPackageProcessesLSP(packageName,













                                UserHandle.getAppId(pkgUid),













                                targetUserId,













                                ProcessList.FOREGROUND_APP_ADJ,















                                ApplicationExitInfo.REASON_DEPENDENCY_DIED,















                                ApplicationExitInfo.SUBREASON_UNKNOWN,















                                "dep: " + packageName);















                    }















                }













            }















        } finally {















            Binder.restoreCallingIdentity(callingId);















        }