Merge "Suppress test differently" into klp-dev
diff --git a/tests/tests/permission/src/android/permission/cts/ContactsProviderTest.java b/tests/tests/permission/src/android/permission/cts/ContactsProviderTest.java
index cd14094..51e54df 100644
--- a/tests/tests/permission/src/android/permission/cts/ContactsProviderTest.java
+++ b/tests/tests/permission/src/android/permission/cts/ContactsProviderTest.java
@@ -30,17 +30,6 @@
* Verify permissions are enforced.
*/
public class ContactsProviderTest extends AndroidTestCase {
- @SmallTest
- public void testAcquireContentProviderClient() throws Exception {
- try {
- final ContentProviderClient provider = getContext().getContentResolver().
- acquireContentProviderClient(Contacts.AUTHORITY);
- fail("acquireContentProviderClient(Contacts.AUTHORITY) did not throw"
- + " SecurityException as expected");
- } catch (SecurityException se) {
- // Expected Exception
- }
- }
/**
* Verifies that query(ContactsContract.Contacts.CONTENT_URI) requires
diff --git a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
index 45f3d51..8c02d6b 100644
--- a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
+++ b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
@@ -131,7 +131,9 @@
}
if (lines.size() == 1) {
- if (!lines.get(0).contains("Permission Denial")) {
+ String message = lines.get(0);
+ if (!message.contains("Permission Denial") &&
+ !message.contains("android.permission.DUMP")) {
fail("dump() for " + service + " produced a single line which didn't "
+ "reference a permission; it may be leaking sensitive data.");
}