commit c83fc2f0e41207685b1721f180846146daee02d8
author Magnus Malmborn <magnus.malmborn@sonymobile.com> Wed May 08 15:03:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 08 15:03:18 2013 -0700
tree 2ddae54f018d68a1cd8580474656fd162326ef52
parent 878f44537a39683846d77c8a293ef0e143271885
parent 07122f5312720757a89f34d0f123352d8b6610d1

am 07122f53: am 18720028: am eb5eb3f9: am 47e257d0: Fix directory recursion in FileSystemPermissionTest

* commit '07122f5312720757a89f34d0f123352d8b6610d1':
  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 2c05246..e140ee7 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -745,6 +745,12 @@
     getAllInsecureDevicesInDirAndSubdir(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();