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

Commit 2a82df99 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent user stop of protected apps" into tm-dev am: 564965fc am: 81d05038 

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



Change-Id: Iab6fd7fcdcef48ccd20e3088493d40c7fba67f8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e287d77 81d05038

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

+8 −0
Original line number Diff line number Diff line
@@ -4399,6 +4399,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

































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



+3
−0




























Original line number
Diff line number
Diff line








@@ -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>");