commit f383d088a5c2b8fd211180258b99b970890076dc
author Chiachang Wang <chiachangwang@google.com> Fri Nov 20 07:29:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 20 07:29:56 2020 +0000
tree fa2244f821aa01f4b63312fd00129c5228832c7d
parent 26aa9c68f70503b8ffbf828440684b06888af2a0
parent 2d7e03cd6157ef93a283f695026e595f4ac58036

Merge changes from topic "move_BSCH"

* changes:
  Remove BasicShellCommandHandler from frameworks/base
  Move BasicShellCommandHandler to frameworks/lib/modules-utils

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d275d65..655275e 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -139,7 +139,6 @@
 import android.net.util.LinkPropertiesUtils.CompareResult;
 import android.net.util.MultinetworkPolicyTracker;
 import android.net.util.NetdService;
-import android.os.BasicShellCommandHandler;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
@@ -192,6 +191,7 @@
 import com.android.internal.util.LocationPermissionChecker;
 import com.android.internal.util.MessageUtils;
 import com.android.internal.util.XmlUtils;
+import com.android.modules.utils.BasicShellCommandHandler;
 import com.android.server.am.BatteryStatsService;
 import com.android.server.connectivity.AutodestructReference;
 import com.android.server.connectivity.DataConnectionStats;