LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move libs/deviceutil to device-side/util

Browse Source 
Test: build cts, run unit tests
bug:21762834
Change-Id: Ifd164ced7f040e312e3553f27adf59a648f463ab
This commit is contained in:
Aaron Holden
2016-12-07 18:52:10 -08:00
parent bc8e970935
commit 37698cb72b
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/hostside/app/Android.mk
View File

@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ub-uiautomator \
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator \
CtsHostsideNetworkTestsAidl
LOCAL_SRC_FILES := $(call all-java-files-under, src)

2
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -16,11 +16,11 @@
package com.android.cts.net.hostside;
import static android.cts.util.SystemUtil.runShellCommand;
import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED;
import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED;
import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;

2
tests/cts/net/Android.mk
View File

@@ -34,7 +34,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsNetTestCases
LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support ctsdeviceutil \
LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support compatibility-device-util \
ctstestrunner ctstestserver mockwebserver
# uncomment when b/13249961 is fixed

3
tests/cts/net/src/android/net/http/cts/HttpResponseCacheTest.java
View File

@@ -21,9 +21,10 @@ import com.google.mockwebserver.MockWebServer;
import junit.framework.TestCase;
import android.cts.util.FileUtils;
import android.net.http.HttpResponseCache;
import com.android.compatibility.common.util.FileUtils;
import java.io.File;
import java.io.InputStream;
import java.net.CacheRequest;

3
tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
View File

@@ -21,7 +21,6 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.cts.util.PollingCheck;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -29,6 +28,8 @@ import android.net.wifi.WifiManager.WifiLock;
import android.net.wifi.WifiSsid;
import android.test.AndroidTestCase;
import com.android.compatibility.common.util.PollingCheck;
import java.util.concurrent.Callable;
public class WifiInfoTest extends AndroidTestCase {