Merge "Don't fail if vold.fstab is empty" into froyo

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index a72d6de162a..df58a2c2519 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -50,7 +50,11 @@ public class VoldExploitTest extends TestCase {
         Set<String> devices = new HashSet<String>();
         devices.addAll(getSysFsPath("/etc/vold.fstab"));
         devices.addAll(getSysFsPath("/system/etc/vold.fstab"));
-        assertTrue(devices.size() > 0);
+        if (devices.isEmpty()) {
+          // FIXME: We should be able to detect this security hole
+          // even if there's no vold.fstab entry
+          return;
+        }
 
         // Verify that all processes listening for netlink messages
         // currently exist.