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

Merge "Prevent user stop of protected apps" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-16 22:09:16 +00:00
committed by Android (Google) Code Review
parent e51b62b2a3 3640aee244
commit 564965fc82
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4409,6 +4409,14 @@ public class ActivityManagerService extends IActivityManager.Stub
+ " but does not exist in that user");
return;
}
// Policy: certain classes of app are not subject to user-invoked stop
if (getPackageManagerInternal().isPackageStateProtected(packageName, userId)) {
Slog.w(TAG, "Asked to stop " + packageName + "/u" + userId
+ " but it is protected");
return;
}
Slog.i(TAG, "Stopping app for user: " + packageName + "/" + userId);
// A specific subset of the work done in forceStopPackageLocked(), because we are

3
services/core/java/com/android/server/am/ActivityManagerShellCommand.java
View File

@@ -3561,6 +3561,9 @@ final class ActivityManagerShellCommand extends ShellCommand {
pw.println(" Enable/disable rate limit on FGS notification deferral policy.");
pw.println(" force-stop [--user <USER_ID> | all | current] <PACKAGE>");
pw.println(" Completely stop the given application package.");
pw.println(" stop-app [--user <USER_ID> | all | current] <PACKAGE>");
pw.println(" Stop an app and all of its services. Unlike `force-stop` this does");
pw.println(" not cancel the app's scheduled alarms and jobs.");
pw.println(" crash [--user <USER_ID>] <PACKAGE|PID>");
pw.println(" Induce a VM crash in the specified package or process");
pw.println(" kill [--user <USER_ID> | all | current] <PACKAGE>");