summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2019-12-06 11:53:29 -0800
committerDavid Su <dysu@google.com>2019-12-06 12:04:21 -0800
commit27097e4a05a8fe280922cd7f5f6b6907dfcc4cd9 (patch)
tree2722c988edf5b4ee49e636e1fe1ee0b2f23b506d /tests
parentdab36927a3c8d644023179a44d48f6507c5726c2 (diff)
Copy libcore.utils.HexEncoding into Wifi module
@CorePlatformApi's cannot be depended on by Wifi Mainline module. Thus create a copy and migrate usages over. Bug: 145409537 Test: atest FrameworksWifiTests Change-Id: I17eda020f10026c000e78f9df9cd569614374caa
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java3
-rw-r--r--tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java3
-rw-r--r--tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java3
3 files changed, 3 insertions, 6 deletions
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;