LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use system api for shell command handling" am: e07b484c22

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

Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb
This commit is contained in:
Chiachang Wang
2020-10-13 09:29:47 +00:00
committed by Automerger Merge Worker
parent e9320762f1 e07b484c22
commit d1fff43886
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -140,6 +140,7 @@ import android.net.util.LinkPropertiesUtils.CompareOrUpdateResult;
import android.net.util.LinkPropertiesUtils.CompareResult; import android.net.util.LinkPropertiesUtils.CompareResult;
import android.net.util.MultinetworkPolicyTracker; import android.net.util.MultinetworkPolicyTracker;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.BasicShellCommandHandler;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -156,11 +157,8 @@ import android.os.PersistableBundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.os.ShellCallback;
import android.os.ShellCommand;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
@@ -7658,14 +7656,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
@Override @Override
public void onShellCommand(@NonNull FileDescriptor in, @NonNull FileDescriptor out, public int handleShellCommand(@NonNull ParcelFileDescriptor in,
FileDescriptor err, @NonNull String[] args, ShellCallback callback, @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,
@NonNull ResultReceiver resultReceiver) { @NonNull String[] args) {
(new ShellCmd()).exec(this, in, out, err, args, callback, resultReceiver); return new ShellCmd().exec(this, in.getFileDescriptor(), out.getFileDescriptor(),
err.getFileDescriptor(), args);
} }
private class ShellCmd extends ShellCommand { private class ShellCmd extends BasicShellCommandHandler {
@Override @Override
public int onCommand(String cmd) { public int onCommand(String cmd) {
if (cmd == null) { if (cmd == null) {