commit eb5eb3f942d5ea20c923a8425732b6c5d9ed649c
author Magnus Malmborn <magnus.malmborn@sonymobile.com> Tue May 07 14:55:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 07 14:55:15 2013 -0700
tree c0f76375d2cd858d827318cfde368f2aac76b95f
parent 5a513a5f86c0497e0d1ac74cce86140676999b29
parent 47e257d0ac6a3d68359d0bd9ec54440e4b08f385

am 47e257d0: Fix directory recursion in FileSystemPermissionTest

* commit '47e257d0ac6a3d68359d0bd9ec54440e4b08f385':
  Fix directory recursion in FileSystemPermissionTest

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 8b1c3f9..5622e15 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -703,6 +703,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();