Remove unenforced READ_EXTERNAL_STORAGE tests.
This permission is now always enforced in KLP, so these tests are no
longer valid.
Bug: 10668366
Change-Id: I809e70bf1cdcb7ae0244531a748d1342cf151856
diff --git a/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java b/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java
index 5298af2..3779db9 100644
--- a/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java
+++ b/hostsidetests/appsecurity/src/com/android/cts/appsecurity/AppSecurityTests.java
@@ -207,47 +207,6 @@
}
/**
- * Test behavior when
- * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} is unenforced.
- */
- public void testReadExternalStorageUnenforced() throws Exception {
- try {
- getDevice().uninstallPackage(EXTERNAL_STORAGE_APP_PKG);
- getDevice().uninstallPackage(WRITE_EXTERNAL_STORAGE_APP_PKG);
-
- // stage test file on external storage
- getDevice().pushString("CAEK",
- getDevice().getMountPoint(IDevice.MNT_EXTERNAL_STORAGE) + "/meow");
-
- // mark permission as not enforced
- setPermissionEnforced(getDevice(), READ_EXTERNAL_STORAGE, false);
-
- // install apps and run test
- assertNull(getDevice()
- .installPackage(getTestAppFile(EXTERNAL_STORAGE_APP_APK), false));
- assertNull(getDevice()
- .installPackage(getTestAppFile(WRITE_EXTERNAL_STORAGE_APP_APK), false));
-
- // normal app should be able to read
- assertTrue("Normal app unable to read external storage", runDeviceTests(
- EXTERNAL_STORAGE_APP_PKG, EXTERNAL_STORAGE_APP_CLASS,
- "testReadExternalStorage"));
-
- // WRITE_EXTERNAL app should be able to read and write
- assertTrue("WRITE_EXTERNAL app unable to read external storage", runDeviceTests(
- WRITE_EXTERNAL_STORAGE_APP_PKG, WRITE_EXTERNAL_STORAGE_APP_CLASS,
- "testReadExternalStorage"));
- assertTrue("WRITE_EXTERNAL app unable to write external storage", runDeviceTests(
- WRITE_EXTERNAL_STORAGE_APP_PKG, WRITE_EXTERNAL_STORAGE_APP_CLASS,
- "testWriteExternalStorage"));
-
- } finally {
- getDevice().uninstallPackage(EXTERNAL_STORAGE_APP_PKG);
- getDevice().uninstallPackage(WRITE_EXTERNAL_STORAGE_APP_PKG);
- }
- }
-
- /**
* Verify that legacy filesystem paths continue working, and that they all
* point to same location.
*/
@@ -541,11 +500,4 @@
getDevice().executeShellCommand(cmd, parser);
return listener.getCurrentRunResults();
}
-
- private static void setPermissionEnforced(
- ITestDevice device, String permission, boolean enforced)
- throws DeviceNotAvailableException {
- device.executeShellCommand("pm set-permission-enforced " + permission + " "
- + Boolean.toString(enforced));
- }
}
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ExternalStorageTest.java b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ExternalStorageTest.java
index d42353d..a3fcf4a 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ExternalStorageTest.java
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ExternalStorageTest.java
@@ -45,15 +45,6 @@
}
}
- public void testReadExternalStorage() throws Exception {
- assertExternalStorageMounted();
- try {
- readExternalStorage();
- } catch (IOException e) {
- fail("unable to read external file");
- }
- }
-
public void testFailReadExternalStorage() throws Exception {
assertExternalStorageMounted();
try {
