From f42e56f08ec6687a269073a3ade35d2fc61d776e Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Thu, 12 Nov 2020 18:27:01 +0000 Subject: [PATCH] Revert "Move BasicShellCommandHandler to frameworks/lib/modules-..." Revert "Update import path of BasicShellCommandHandler" Revert "Update path for BasicShellCommandHandler" Revert "Update path for BasicShellCommandHandler" Revert "Update rule for BasicShellCommandHandler" Revert submission 12975279-move_BSCH Reason for revert: b/173120275 Reverted Changes: Ib750f4774:Move BasicShellCommandHandler I43c0dc327:Update import path of BasicShellCommandHandler I73d58c07c:Update path for BasicShellCommandHandler I21f103949:Update path for BasicShellCommandHandler I8a2873df6:Move BasicShellCommandHandler to frameworks/lib/mo... I91df774a3:Update rule for BasicShellCommandHandler Exempt-From-Owner-Approval: to fix b/173120275 Change-Id: Iaa44f9aa4c1621f331275dc76ecb7505100fe9c5 --- services/core/java/com/android/server/ConnectivityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index aa3226b137..ca0f8b74c2 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -137,6 +137,7 @@ import android.net.netlink.InetDiagMessage; import android.net.shared.PrivateDnsConfig; 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; @@ -189,7 +190,6 @@ import com.android.internal.util.IndentingPrintWriter; 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.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult; import com.android.net.module.util.LinkPropertiesUtils.CompareResult; import com.android.server.am.BatteryStatsService;