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

Commit 89258c7d authored by Mateus Azis's avatar Mateus Azis Committed by Gerrit Code Review
Browse files

Merge "Remove unused fields from ProcessObserver." into main

parents ec4bfb02 012cfaba

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

+4 −10
Original line number Diff line number Diff line
@@ -396,7 +396,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":
@@ -3644,11 +3644,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();
@@ -3683,15 +3682,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