Be less pedantic about DUMP permission messages
The DUMP permission test required the "Permission Denial" but that was a
bit too strict. Expanding it to capture messages like:
Security exception: Neither user N nor current process has android.permission.DUMP.
Bug: 10994315
Change-Id: Id0169ce1b5f08ddac986487b5737498ad1009480
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.");
}
