commit fdd3a84fc6d5d1e534515142654f1b7383785ac3
author Daniel Xie <dxie@google.com> Thu Aug 27 17:52:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 27 17:52:20 2015 +0000
tree 4f0f5a5ff038a637f1ab5a454280cd9a95719b5f
parent 09016120a8706550e1b2ebabbea50a8df8547567
parent b5ce7d463c33789a9c23f50c5787a2a70fafe13d

Merge "DO NOT MERGE: Exempt inactive backup service from ServicePermissionsTest" into lollipop-mr1-cts-dev

tests/tests/security/src/android/security/cts/ServicePermissionsTest.java

diff --git a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
index 00cbfd8..bda0d6d 100644
--- a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
+++ b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
@@ -137,7 +137,9 @@
 
             if (lines.size() == 1) {
                 String message = lines.get(0);
-                if (!message.contains("Permission Denial") &&
+                if ("backup".equals(service) && "Inactive".equals(message)) {
+                    Log.i(TAG, "Exempt inactive backup service.");
+                } else 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.");