commit 47e257d0ac6a3d68359d0bd9ec54440e4b08f385
author Magnus Malmborn <magnus.malmborn@sonymobile.com> Fri May 03 11:27:08 2013 +0200
committer Brian Muramatsu <btmura@google.com> Tue May 07 14:24:09 2013 -0700
tree b854c2acce8fefc57062bf2d0edb1485b52b1e57
parent 37388df709e7c2d5e70038cdb2e6a56cc96ad2e4

Fix directory recursion in FileSystemPermissionTest

FileSystemPermissionTest.testAllBlockDevicesAreSecure() was missing
the check for symbolic links, so add it.

Change-Id: I821e6806e2ae8f7a4b472ab2f2d4d1e17616f188

tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java

diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index 92f3e53..ec4fe3f 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -665,6 +665,12 @@
     getAllInsecureBlockDevicesInDirAndSubdir(File dir) throws Exception {
         assertTrue(dir.isDirectory());
         Set<File> retval = new HashSet<File>();
+
+        if (isSymbolicLink(dir)) {
+            // don't examine symbolic links.
+            return retval;
+        }
+
         File[] subDirectories = dir.listFiles(new FileFilter() {
             @Override public boolean accept(File pathname) {
                 return pathname.isDirectory();