Merge "Revert "[Mainline] Migrate android.utils package items"" am: 8115741902 am: bb9c442c90 am: 3eb2f4625d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579467 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I095637d096ed0a38c9d7baa2148bd7e514a46a9a
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user