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

Commit d4e82f15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix: crash when running am.jar without parameters" am: 3bec4772 am:... 

Merge "Fix: crash when running am.jar without parameters" am: 3bec4772 am: 23f93b8c am: cfd38b49 am: 2a56521b

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

Change-Id: I2b5405fb177f740cb5e1a4cda86ab86220a3c614
parents c2d90563 2a56521b

cmds/am/src/com/android/commands/am/Am.java

+18 −13
Original line number Original line Diff line number Diff line
@@ -41,6 +41,10 @@ public class Am extends BaseCommand { 
    private IActivityManager mAm;

    private IActivityManager mAm;

    private IPackageManager mPm;

    private IPackageManager mPm;





    Am() {

        svcInit();

    }



    /**

    /**

     * Command-line entry point.

     * Command-line entry point.

     *

     *
@@ -50,6 +54,20 @@ public class Am extends BaseCommand { 
        (new Am()).run(args);

        (new Am()).run(args);

    }

    }





    private void svcInit() {

        mAm = ActivityManager.getService();

        if (mAm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            return;

        }



        mPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));

        if (mPm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            return;

        }

    }



    @Override

    @Override

    public void onShowUsage(PrintStream out) {

    public void onShowUsage(PrintStream out) {

        try {

        try {
@@ -61,19 +79,6 @@ public class Am extends BaseCommand { 




    @Override

    @Override

    public void onRun() throws Exception {

    public void onRun() throws Exception {



        mAm = ActivityManager.getService();

        if (mAm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            throw new AndroidException("Can't connect to activity manager; is the system running?");

        }



        mPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));

        if (mPm == null) {

            System.err.println(NO_SYSTEM_ERROR_CODE);

            throw new AndroidException("Can't connect to package manager; is the system running?");

        }



        String op = nextArgRequired();

        String op = nextArgRequired();





        if (op.equals("instrument")) {

        if (op.equals("instrument")) {