Fix build.

Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16

1 files changed, 0 insertions, 22 deletions

diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index d1c4221023d9..d71c3e6e2dbe 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -382,26 +382,4 @@ public class FileUtils {
         }
         return filePath.startsWith(dirPath);
     }
-
-    /**
-     * Test if a file lives under the given directory, either as a direct child
-     * or a distant grandchild.
-     * <p>
-     * Both files <em>must</em> have been resolved using
-     * {@link File#getCanonicalFile()} to avoid symlink or path traversal
-     * attacks.
-     */
-    public static boolean contains(File dir, File file) {
-        String dirPath = dir.getAbsolutePath();
-        String filePath = file.getAbsolutePath();
-
-        if (dirPath.equals(filePath)) {
-            return true;
-        }
-
-        if (!dirPath.endsWith("/")) {
-            dirPath += "/";
-        }
-        return filePath.startsWith(dirPath);
-    }
 }