diff options
10 files changed, 10 insertions, 20 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareClientState.java b/service/java/com/android/server/wifi/aware/WifiAwareClientState.java index fb982699f..f4135743d 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareClientState.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareClientState.java @@ -21,14 +21,13 @@ import android.app.AppOpsManager; import android.content.Context; import android.net.wifi.aware.ConfigRequest; import android.net.wifi.aware.IWifiAwareEventCallback; +import android.net.wifi.util.HexEncoding; import android.os.RemoteException; import android.util.Log; import android.util.SparseArray; import com.android.server.wifi.util.WifiPermissionsUtil; -import libcore.util.HexEncoding; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.Arrays; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java index 35cb91d1e..0bb0131f5 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java @@ -41,6 +41,7 @@ import android.net.wifi.aware.WifiAwareManager; import android.net.wifi.aware.WifiAwareNetworkInfo; import android.net.wifi.aware.WifiAwareNetworkSpecifier; import android.net.wifi.aware.WifiAwareUtils; +import android.net.wifi.util.HexEncoding; import android.os.Build; import android.os.Handler; import android.os.IBinder; @@ -57,8 +58,6 @@ import com.android.server.wifi.Clock; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; -import libcore.util.HexEncoding; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.net.DatagramSocket; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDiscoverySessionState.java b/service/java/com/android/server/wifi/aware/WifiAwareDiscoverySessionState.java index 67d98558a..f58b3d78e 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareDiscoverySessionState.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareDiscoverySessionState.java @@ -20,12 +20,11 @@ import android.hardware.wifi.V1_0.NanStatusType; import android.net.wifi.aware.IWifiAwareDiscoverySessionCallback; import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; +import android.net.wifi.util.HexEncoding; import android.os.RemoteException; import android.util.Log; import android.util.SparseArray; -import libcore.util.HexEncoding; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.Arrays; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java index d016b98d2..776b52570 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeApi.java @@ -37,6 +37,7 @@ import android.hardware.wifi.V1_2.NanConfigRequestSupplemental; import android.net.wifi.aware.ConfigRequest; import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; +import android.net.wifi.util.HexEncoding; import android.os.RemoteException; import android.os.ShellCommand; import android.text.TextUtils; @@ -45,8 +46,6 @@ import android.util.SparseIntArray; import com.android.internal.annotations.VisibleForTesting; -import libcore.util.HexEncoding; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java index 7cb6e84c8..4172a412f 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeCallback.java @@ -28,13 +28,12 @@ import android.hardware.wifi.V1_0.WifiNanStatus; import android.hardware.wifi.V1_2.IWifiNanIfaceEventCallback; import android.hardware.wifi.V1_2.NanDataPathChannelInfo; import android.hardware.wifi.V1_2.NanDataPathScheduleUpdateInd; +import android.net.wifi.util.HexEncoding; import android.os.ShellCommand; import android.util.Log; import android.util.SparseArray; import android.util.SparseIntArray; -import libcore.util.HexEncoding; - import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java index 042bbe21d..2b648c0f1 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareStateManager.java @@ -34,6 +34,7 @@ import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; import android.net.wifi.aware.WifiAwareManager; import android.net.wifi.aware.WifiAwareNetworkSpecifier; +import android.net.wifi.util.HexEncoding; import android.os.Bundle; import android.os.Looper; import android.os.Message; @@ -57,8 +58,6 @@ import com.android.server.wifi.Clock; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; -import libcore.util.HexEncoding; - import org.json.JSONException; import org.json.JSONObject; diff --git a/service/java/com/android/server/wifi/util/NativeUtil.java b/service/java/com/android/server/wifi/util/NativeUtil.java index d904399a3..bcc426c48 100644 --- a/service/java/com/android/server/wifi/util/NativeUtil.java +++ b/service/java/com/android/server/wifi/util/NativeUtil.java @@ -16,12 +16,11 @@ package com.android.server.wifi.util; +import android.net.wifi.util.HexEncoding; import android.text.TextUtils; import com.android.server.wifi.ByteBufferReader; -import libcore.util.HexEncoding; - import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java index 72bf37ef3..fa9bf9243 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.net.MacAddress; import android.net.wifi.WifiConfiguration; +import android.net.wifi.util.HexEncoding; import android.os.Handler; import android.os.test.TestLooper; @@ -36,8 +37,6 @@ import com.android.server.wifi.util.EncryptedData; import com.android.server.wifi.util.WifiConfigStoreEncryptionUtil; import com.android.server.wifi.util.XmlUtil; -import libcore.util.HexEncoding; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java index 29e782d16..db0704187 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java @@ -66,6 +66,7 @@ import android.net.wifi.aware.WifiAwareManager; import android.net.wifi.aware.WifiAwareNetworkInfo; import android.net.wifi.aware.WifiAwareNetworkSpecifier; import android.net.wifi.aware.WifiAwareSession; +import android.net.wifi.util.HexEncoding; import android.os.Build; import android.os.Handler; import android.os.INetworkManagementService; @@ -85,8 +86,6 @@ import com.android.server.wifi.WifiBaseTest; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; -import libcore.util.HexEncoding; - import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java index 5522d1918..1db13aec9 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java @@ -59,6 +59,7 @@ import android.net.wifi.aware.IWifiAwareMacAddressProvider; import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; import android.net.wifi.aware.WifiAwareManager; +import android.net.wifi.util.HexEncoding; import android.os.Handler; import android.os.IBinder; import android.os.IPowerManager; @@ -77,8 +78,6 @@ import com.android.server.wifi.WifiBaseTest; import com.android.server.wifi.util.WifiPermissionsUtil; import com.android.server.wifi.util.WifiPermissionsWrapper; -import libcore.util.HexEncoding; - import org.junit.After; import org.junit.Before; import org.junit.Rule; |