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

Commit 933bf11c authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Change argument types from FD to PFD 

Bug: 142751512
Test: "adb shell cmd jobschduler help"
Test: "adb shell cmd activity help"
Change-Id: Ic35588f7c9fcaa06e3cf4feeedf54b3a0835ad44
parent 961107d8

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+6 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.os.Binder; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.ParcelFileDescriptor;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -2688,10 +2689,12 @@ public class JobSchedulerService extends com.android.server.SystemService 
        }



        @Override

        protected int handleShellCommand(@NonNull FileDescriptor in, @NonNull FileDescriptor out,

                @NonNull FileDescriptor err, @NonNull String[] args) {

        protected int handleShellCommand(@NonNull ParcelFileDescriptor in,

                @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

                @NonNull String[] args) {

            return (new JobSchedulerShellCommand(JobSchedulerService.this)).exec(

                    this, in, out, err, args);

                    this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(),

                    args);

        }

core/java/android/os/Binder.java

+6 −4
Original line number Diff line number Diff line
@@ -933,7 +933,8 @@ public class Binder implements IBinder { 


        int result = -1;

        try {

            result = handleShellCommand(in, out, err, args);

            result = handleShellCommand(new ParcelFileDescriptor(in),

                    new ParcelFileDescriptor(out), new ParcelFileDescriptor(err), args);

        } finally {

            resultReceiver.send(result, null);

        }
@@ -954,9 +955,10 @@ public class Binder implements IBinder { 
     * @hide

     */

    // @SystemApi TODO Make it a system API.

    protected int handleShellCommand(@NonNull FileDescriptor in, @NonNull FileDescriptor out,

            @NonNull FileDescriptor err, @NonNull String[] args) {

        FileOutputStream ferr = new FileOutputStream(err);

    protected int handleShellCommand(@NonNull ParcelFileDescriptor in,

            @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

            @NonNull String[] args) {

        FileOutputStream ferr = new FileOutputStream(err.getFileDescriptor());

        PrintWriter pw = new FastPrintWriter(ferr);

        pw.println("No shell command implementation.");

        pw.flush();