commit 3eded2f880ae0c1bb2437d12d0f8884b91dea5dd
author Serik Beketayev <serikb@google.com> Sat Feb 06 09:19:47 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Feb 07 22:49:42 2021 +0000
tree ed093e7a4022ca6dd508ce3c86d528bb7eac12bc
parent df6928cf5cd673c50038e8b56abc138dc47c7c1e

Revert "[Mainline] Migrate android.utils package items"

Revert submission 1553146-android_util

Reason for revert: Build Breakage aosp-master/db845c-userdebug @ 7128996
Reverted Changes:
Ia39f6e03f:[Mainline] Migrate android.utils package items
Iaf99140d6:[Mainline] Migrate android.utils package items

Change-Id: I5bdaec5d1a87436510c3e05fadaf0124d86b1bdf
(cherry picked from commit 28c40e2d49268235a9b1552d283fd773a8747837)

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 13f6fe6..c5ad048 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -172,6 +172,7 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.LocalLog;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
@@ -192,7 +193,6 @@
 import com.android.internal.util.LocationPermissionChecker;
 import com.android.internal.util.MessageUtils;
 import com.android.modules.utils.BasicShellCommandHandler;
-import com.android.modules.utils.LocalLog;
 import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult;
 import com.android.net.module.util.LinkPropertiesUtils.CompareResult;
 import com.android.server.am.BatteryStatsService;