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

Commit 57dd3246 authored by Serik Beketayev's avatar Serik Beketayev Committed by Automerger Merge Worker
Browse files

Merge "[Mainline] Migrate android.utils package items" am: 85e72415 am:... 

Merge "[Mainline] Migrate android.utils package items" am: 85e72415 am: 784dd43b am: 8dc78a38 am: c45d486f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1233b6ea7110ae31176cdb1d2935c7d1cd93baf1
parents 32b918d8 c45d486f

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 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;
@@ -193,6 +192,7 @@ 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;