Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e1786f authored by Serik Beketayev's avatar Serik Beketayev Committed by Automerger Merge Worker
Browse files

Merge "Revert "[Mainline] Migrate android.utils package items"" am: 57a531fd... 

Merge "Revert "[Mainline] Migrate android.utils package items"" am: 57a531fd am: e1eb1369 am: d4fff61f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I095637d096ed0a38c9d7baa2148bd7e514a46a9a
parents 6e08c395 d4fff61f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,6 +172,7 @@ import android.security.KeyStore; 
import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.LocalLog;

import android.util.Log;

import android.util.Log;

import android.util.Pair;

import android.util.Pair;

import android.util.SparseArray;

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.LocationPermissionChecker;

import com.android.internal.util.MessageUtils;

import com.android.internal.util.MessageUtils;

import com.android.modules.utils.BasicShellCommandHandler;

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.CompareOrUpdateResult;

import com.android.net.module.util.LinkPropertiesUtils.CompareResult;

import com.android.net.module.util.LinkPropertiesUtils.CompareResult;

import com.android.server.am.BatteryStatsService;

import com.android.server.am.BatteryStatsService;