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

Commit baca7990 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

Merge "Enforce guards against crash command via shell" into tm-dev am: 4d2ea02b am: 496c0968 

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



Change-Id: I7309b46d27e9a2fd8b3e78d4ac3991ca84ad3339
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be565e3b 496c0968

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

+13 −2
Original line number Diff line number Diff line
@@ -1200,8 +1200,19 @@ final class ActivityManagerShellCommand extends ShellCommand { 
        } catch (NumberFormatException e) {

            packageName = arg;

        }

        mInterface.crashApplicationWithType(-1, pid, packageName, userId, "shell-induced crash",



        int[] userIds = (userId == UserHandle.USER_ALL) ? mInternal.mUserController.getUserIds()

                : new int[]{userId};

        for (int id : userIds) {

            if (mInternal.mUserController.hasUserRestriction(

                    UserManager.DISALLOW_DEBUGGING_FEATURES, id)) {

                getOutPrintWriter().println(

                        "Shell does not have permission to crash packages for user " + id);

                continue;

            }

            mInterface.crashApplicationWithType(-1, pid, packageName, id, "shell-induced crash",

                    false, CrashedByAdbException.TYPE_ID);

        }

        return 0;

    }

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

+11 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.app.ActivityOptions; 
import android.app.AnrController;

import android.app.ApplicationErrorReport;

import android.app.ApplicationExitInfo;

import android.app.RemoteServiceException.CrashedByAdbException;

import android.app.usage.UsageStatsManager;

import android.content.ActivityNotFoundException;

import android.content.Context;
@@ -523,6 +524,16 @@ class AppErrors { 
            return;

        }



        if (exceptionTypeId == CrashedByAdbException.TYPE_ID) {

            String[] packages = proc.getPackageList();

            for (int i = 0; i < packages.length; i++) {

                if (mService.mPackageManagerInt.isPackageStateProtected(packages[i], proc.userId)) {

                    Slog.w(TAG, "crashApplication: Can not crash protected package " + packages[i]);

                    return;

                }

            }

        }



        proc.scheduleCrashLocked(message, exceptionTypeId, extras);

        if (force) {

            // If the app is responsive, the scheduled crash will happen as expected