Loading services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +7 −6 Original line number Diff line number Diff line Loading @@ -86,12 +86,11 @@ import android.os.Handler; import android.os.IBinder; import android.os.IInterface; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PowerWhitelistManager; import android.os.Process; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.ShellCallback; import android.os.ShellCommand; import android.os.UserHandle; import android.os.UserManager; Loading Loading @@ -697,10 +696,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } @Override public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, String[] args, ShellCallback callback, ResultReceiver resultReceiver) throws RemoteException { new ShellCmd().exec(this, in, out, err, args, callback, resultReceiver); public int handleShellCommand(@NonNull ParcelFileDescriptor in, @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err, @NonNull String[] args) { return new ShellCmd() .exec(this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(), args); } @Override Loading Loading
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +7 −6 Original line number Diff line number Diff line Loading @@ -86,12 +86,11 @@ import android.os.Handler; import android.os.IBinder; import android.os.IInterface; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PowerWhitelistManager; import android.os.Process; import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.ShellCallback; import android.os.ShellCommand; import android.os.UserHandle; import android.os.UserManager; Loading Loading @@ -697,10 +696,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } @Override public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, String[] args, ShellCallback callback, ResultReceiver resultReceiver) throws RemoteException { new ShellCmd().exec(this, in, out, err, args, callback, resultReceiver); public int handleShellCommand(@NonNull ParcelFileDescriptor in, @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err, @NonNull String[] args) { return new ShellCmd() .exec(this, in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(), args); } @Override Loading