commit c565ba340d5bc05494a98b4c5eac38bc90673943
author Dianne Hackborn <hackbod@google.com> Wed Jan 24 17:58:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 24 17:58:49 2018 +0000
tree 452edf0418a1f79df02143acc22c160b81b10a86
parent e2fea86b44e94f058d0adbda6948fcc87a7e4135
parent 568c73dec27a3272f80e43990c91fc48b8fec0b9

Merge "Fix issue #72116995: Add permission guarding Service#startForeground"

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

diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index 80fd222..47ab9fa 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -1013,7 +1013,8 @@
     private Intent getIntentForComponent(int type) {
         final Intent intent = new Intent();
         if (type == TYPE_COMPONENT_ACTIVTIY) {
-            intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_ACTIVITY_CLASS));
+            intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_ACTIVITY_CLASS))
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         } else if (type == TYPE_COMPONENT_FOREGROUND_SERVICE) {
             intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_SERVICE_CLASS))
                     .setFlags(1);

tests/cts/net/Android.mk

diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 1d4d54b..e348406 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -28,7 +28,7 @@
     voip-common \
     conscrypt \
     org.apache.http.legacy \
-    android.test.base \
+    android.test.base.stubs \
 
 
 LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \