Merge "Update CTS ConnectivityManager permissions tests to work with L release." into lmp-dev
diff --git a/tests/tests/permission/src/android/permission/cts/ConnectivityManagerPermissionTest.java b/tests/tests/permission/src/android/permission/cts/ConnectivityManagerPermissionTest.java
index d9a61f4..8714100 100644
--- a/tests/tests/permission/src/android/permission/cts/ConnectivityManagerPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/ConnectivityManagerPermissionTest.java
@@ -55,22 +55,6 @@
}
/**
- * Verify that calling {@link ConnectivityManager#getNetworkPreference()}
- * requires permissions.
- * <p>Tests Permission:
- * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
- */
- @SmallTest
- public void testGetNetworkPreference() {
- try {
- mConnectivityManager.getNetworkPreference();
- fail("Was able to call getNetworkPreference");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- /**
* Verify that calling {@link ConnectivityManager#requestRouteToHost(int, int)}
* requires permissions.
* <p>Tests Permission:
@@ -85,37 +69,5 @@
// expected
}
}
-
- /**
- * Verify that calling {@link ConnectivityManager#setNetworkPreference(int)}
- * requires permissions.
- * <p>Tests Permission:
- * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
- */
- @SmallTest
- public void testSetNetworkPreference() {
- try {
- mConnectivityManager.setNetworkPreference(ConnectivityManager.TYPE_MOBILE);
- fail("Was able to call setNetworkPreference");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- /**
- * Verify that calling {@link ConnectivityManager#setNetworkPreference(int)}
- * requires permissions.
- * <p>Tests Permission:
- * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
- */
- @SmallTest
- public void testStartUsingNetworkPreference() {
- try {
- mConnectivityManager.setNetworkPreference(ConnectivityManager.TYPE_MOBILE);
- fail("Was able to call setNetworkPreference");
- } catch (SecurityException e) {
- // expected
- }
- }
}
diff --git a/tests/tests/permission/src/android/permission/cts/NoNetworkStatePermissionTest.java b/tests/tests/permission/src/android/permission/cts/NoNetworkStatePermissionTest.java
index 0f24cf5..0eae9cc 100644
--- a/tests/tests/permission/src/android/permission/cts/NoNetworkStatePermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/NoNetworkStatePermissionTest.java
@@ -27,9 +27,8 @@
*/
public class NoNetworkStatePermissionTest extends AndroidTestCase {
private ConnectivityManager mConnectivityManager;
- private static final int TEST_NETWORK_TYPE = 1;
- private static final int TEST_PREFERENCE = 1;
- private static final String TEST_FEATURE = "feature";
+ private static final int TEST_NETWORK_TYPE = ConnectivityManager.TYPE_MOBILE;
+ private static final String TEST_FEATURE = "enableHIPRI";
@Override
protected void setUp() throws Exception {
@@ -40,22 +39,6 @@
}
/**
- * Verify that ConnectivityManager#getNetworkPreference() requires permissions.
- * <p>Requires Permission:
- * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
- */
- @SmallTest
- public void testGetNetworkPreference() {
- try {
- mConnectivityManager.getNetworkPreference();
- fail("ConnectivityManager.getNetworkPreference didn't throw SecurityException as"
- + " expected");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- /**
* Verify that ConnectivityManager#getActiveNetworkInfo() requires permissions.
* <p>Requires Permission:
* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
@@ -104,22 +87,6 @@
}
/**
- * Verify that ConnectivityManager#setNetworkPreference() requires permissions.
- * <p>Requires Permission:
- * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
- */
- @SmallTest
- public void testSetNetworkPreference() {
- try {
- mConnectivityManager.setNetworkPreference(TEST_PREFERENCE);
- fail("ConnectivityManager.setNetworkPreference didn't throw SecurityException as"
- + " expected");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- /**
* Verify that ConnectivityManager#startUsingNetworkFeature() requires permissions.
* <p>Requires Permission:
* {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
@@ -136,22 +103,6 @@
}
/**
- * Verify that ConnectivityManager#stopUsingNetworkFeature() requires permissions.
- * <p>Requires Permission:
- * {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
- */
- @SmallTest
- public void testStopUsingNetworkFeature() {
- try {
- mConnectivityManager.stopUsingNetworkFeature(TEST_NETWORK_TYPE, TEST_FEATURE);
- fail("ConnectivityManager.stopUsingNetworkFeature didn't throw SecurityException as"
- + " expected");
- } catch (SecurityException e) {
- // expected
- }
- }
-
- /**
* Verify that ConnectivityManager#requestRouteToHost() requires permissions.
* <p>Requires Permission:
* {@link android.Manifest.permission#CHANGE_NETWORK_STATE}.
