commit ad71dcf7275bfa961fb05e86c77f109c95c4e892
author Prashant Malani <pmalani@google.com> Tue Sep 22 16:53:10 2015 -0700
committer Prashant Malani <pmalani@google.com> Fri Sep 25 17:58:13 2015 +0000
tree dcca27a39d42be81f712e251035e390e01941a1d
parent 49fe9d6b295775b7ca744999b1252414f1cec52a

Fix DrmServer test for devices that don't require drmserver

Bug: 24404664

Change-Id: If6296897f75ec4b3628b47b5829e7446d106d5f9

hostsidetests/security/src/android/cts/security/SELinuxHostTest.java

diff --git a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
index a0d3167..abb1ac4 100644
--- a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
+++ b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
@@ -589,9 +589,9 @@
         assertDomainN("u:r:zygote:s0", "zygote", "zygote64");
     }
 
-    /* drm server is always present */
+    /* Checks drmserver for devices that require it */
     public void testDrmServerDomain() throws DeviceNotAvailableException {
-        assertDomainOne("u:r:drmserver:s0", "/system/bin/drmserver");
+        assertDomainZeroOrOne("u:r:drmserver:s0", "/system/bin/drmserver");
     }
 
     /* Media server is always running */