commit 07122f5312720757a89f34d0f123352d8b6610d1
author Magnus Malmborn <magnus.malmborn@sonymobile.com> Tue May 07 15:10:08 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 07 15:10:08 2013 -0700
tree 2066cea82e23188d52e8c4b49657cf62c02fbab3
parent 79ccef24a7a23d813535ebca6df0503fe5de38f5
parent 18720028f1c9d20f82664bc9c0aa8596c80d5ff9

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

* commit '18720028f1c9d20f82664bc9c0aa8596c80d5ff9':
  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 7b6a932..3abcbb6 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -686,6 +686,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();