Merge "Move some NetworkStats tests to tests/net."

2017-04-13 05:18:46 +00:00
parent 78e38f292d 4ff3a778ab
commit 972b2717f5
7 changed files with 2 additions and 2 deletions
--- a/core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java
+++ b/core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java
@@ -38,7 +38,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
 import android.util.Log;
-import com.android.frameworks.coretests.R;
+import com.android.frameworks.tests.net.R;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
--- a/core/tests/coretests/src/android/net/NetworkStatsTest.java
+++ b/core/tests/coretests/src/android/net/NetworkStatsTest.java
--- a/core/tests/coretests/src/com/android/internal/net/NetworkStatsFactoryTest.java
+++ b/core/tests/coretests/src/com/android/internal/net/NetworkStatsFactoryTest.java
@@ -30,7 +30,7 @@ import android.net.NetworkStats;
 import android.net.TrafficStats;
 import android.test.AndroidTestCase;
-import com.android.frameworks.coretests.R;
+import com.android.frameworks.tests.net.R;
 import java.io.File;
 import java.io.FileOutputStream;
--- a/tests/net/res/raw/history_v1
+++ b/tests/net/res/raw/history_v1
--- a/core/tests/coretests/res/raw/xt_qtaguid_iface_fmt_typical
+++ b/core/tests/coretests/res/raw/xt_qtaguid_iface_fmt_typical
--- a/core/tests/coretests/res/raw/xt_qtaguid_iface_typical
+++ b/core/tests/coretests/res/raw/xt_qtaguid_iface_typical
--- a/core/tests/coretests/res/raw/xt_qtaguid_typical
+++ b/core/tests/coretests/res/raw/xt_qtaguid_typical