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

Commit 07c812e2 authored by Mateus Azis's avatar Mateus Azis Committed by Automerger Merge Worker
Browse files

Merge "Remove unused fields from ProcessObserver." into main am: 89258c7d... 

Merge "Remove unused fields from ProcessObserver." into main am: 89258c7d am: 26b51dca am: 4901f3ce

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



Change-Id: I8e8d061236c6cd42433cabeeb31d6c9ffbe34a98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13948bbf 4901f3ce

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

+4 −10
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                case "get-bg-restriction-level":

                    return runGetBgRestrictionLevel(pw);

                case "observe-foreground-process":

                    return runGetCurrentForegroundProcess(pw, mInternal, mTaskInterface);

                    return runGetCurrentForegroundProcess(pw, mInternal);

                case "reset-dropbox-rate-limiter":

                    return runResetDropboxRateLimiter();

                case "list-displays-for-starting-users":
@@ -3690,11 +3690,10 @@ final class ActivityManagerShellCommand extends ShellCommand { 
        return -1;

    }



    private int runGetCurrentForegroundProcess(PrintWriter pw,

            IActivityManager iam, IActivityTaskManager iatm)

    private int runGetCurrentForegroundProcess(PrintWriter pw, IActivityManager iam)

            throws RemoteException {



        ProcessObserver observer = new ProcessObserver(pw, iam, iatm, mInternal);

        ProcessObserver observer = new ProcessObserver(pw, iam);

        iam.registerProcessObserver(observer);



        final InputStream mInput = getRawInputStream();
@@ -3729,15 +3728,10 @@ final class ActivityManagerShellCommand extends ShellCommand { 


        private PrintWriter mPw;

        private IActivityManager mIam;

        private IActivityTaskManager mIatm;

        private ActivityManagerService mInternal;



        ProcessObserver(PrintWriter mPw, IActivityManager mIam,

                IActivityTaskManager mIatm, ActivityManagerService ams) {

        ProcessObserver(PrintWriter mPw, IActivityManager mIam) {

            this.mPw = mPw;

            this.mIam = mIam;

            this.mIatm = mIatm;

            this.mInternal = ams;

        }



        @Override