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

Commit c10395b8 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change argument types from FD to PFD""

parents 060e5ba4 6dbd2d62

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

+3 −6
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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;
@@ -2689,12 +2688,10 @@ public class JobSchedulerService extends com.android.server.SystemService 
        }



        @Override

        protected int handleShellCommand(@NonNull ParcelFileDescriptor in,

                @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

                @NonNull String[] args) {

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

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

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

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

                    args);

                    this, in, out, err, args);

        }

core/java/android/os/Binder.java

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


        int result = -1;

        try {

            result = handleShellCommand(new ParcelFileDescriptor(in),

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

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

        } finally {

            resultReceiver.send(result, null);

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

     */

    // @SystemApi TODO Make it a system API.

    protected int handleShellCommand(@NonNull ParcelFileDescriptor in,

            @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

            @NonNull String[] args) {

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

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

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

        FileOutputStream ferr = new FileOutputStream(err);

        PrintWriter pw = new FastPrintWriter(ferr);

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

        pw.flush();