diff options
| author | 2021-02-07 04:14:35 +0000 | |
|---|---|---|
| committer | 2021-02-07 04:14:35 +0000 | |
| commit | d4fff61f2215f5449c1d48e4448bb5e9c696d32d (patch) | |
| tree | 0d2990a1a1e2120c627dbb7d6e3d74341c1ad0d1 | |
| parent | 8dc78a380e0070514f8b74de9f4e9852403e7928 (diff) | |
| parent | e1eb1369848bc3c10f7b16c013dc361c71602cfd (diff) | |
Merge "Revert "[Mainline] Migrate android.utils package items"" am: 57a531fdd6 am: e1eb136984
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f4812a5404b1b63fae605406aa0b22e1a991ab3
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 13f6fe6a6aa0..c5ad04891026 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.security.KeyStore; 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.IndentingPrintWriter; 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; |