Revert "DO NOT MERGE ANYWHERE: Add findPath API to SAF."

This reverts commit 2f6d0d6db3af4451ae209a07c7dd7ee089cc5653.

Change-Id: I0b8581c6d5edb2a47ddfb75afaaa52c43964087b

1 files changed, 3 insertions, 32 deletions

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 3b575a8a03a6..33d6b9a33ef8 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -41,7 +41,6 @@ import android.os.storage.VolumeInfo;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
 import android.provider.DocumentsContract.Root;
-import android.provider.DocumentsContract.Path;
 import android.provider.DocumentsProvider;
 import android.provider.MediaStore;
 import android.provider.Settings;
@@ -49,7 +48,6 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.DebugUtils;
 import android.util.Log;
-import android.util.Pair;
 import android.webkit.MimeTypeMap;
 
 import com.android.internal.annotations.GuardedBy;
@@ -185,8 +183,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
             root.rootId = rootId;
             root.volumeId = volume.id;
             root.flags = Root.FLAG_LOCAL_ONLY
-                    | Root.FLAG_SUPPORTS_SEARCH
-                    | Root.FLAG_SUPPORTS_IS_CHILD;
+                    | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD;
 
             final DiskInfo disk = volume.getDisk();
             if (DEBUG) Log.d(TAG, "Disk for root " + rootId + " is " + disk);
@@ -273,6 +270,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
         return projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION;
     }
 
+
     private String getDocIdForFile(File file) throws FileNotFoundException {
         return getDocIdForFileMaybeCreate(file, false);
     }
@@ -325,11 +323,6 @@ public class ExternalStorageProvider extends DocumentsProvider {
     }
 
     private File getFileForDocId(String docId, boolean visible) throws FileNotFoundException {
-        return resolveDocId(docId, visible).second;
-    }
-
-    private Pair<RootInfo, File> resolveDocId(String docId, boolean visible)
-            throws FileNotFoundException {
         final int splitIndex = docId.indexOf(':', 1);
         final String tag = docId.substring(0, splitIndex);
         final String path = docId.substring(splitIndex + 1);
@@ -353,7 +346,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
         if (!target.exists()) {
             throw new FileNotFoundException("Missing file for " + docId + " at " + target);
         }
-        return Pair.create(root, target);
+        return target;
     }
 
     private void includeFile(MatrixCursor result, String docId, File file)
@@ -430,28 +423,6 @@ public class ExternalStorageProvider extends DocumentsProvider {
     }
 
     @Override
-    public Path findPath(String documentId)
-            throws FileNotFoundException {
-        LinkedList<String> path = new LinkedList<>();
-
-        final Pair<RootInfo, File> resolvedDocId = resolveDocId(documentId, false);
-        RootInfo root = resolvedDocId.first;
-        File file = resolvedDocId.second;
-
-        if (!file.exists()) {
-            throw new FileNotFoundException();
-        }
-
-        while (file != null && file.getAbsolutePath().startsWith(root.path.getAbsolutePath())) {
-            path.addFirst(getDocIdForFile(file));
-
-            file = file.getParentFile();
-        }
-
-        return new Path(root.rootId, path);
-    }
-
-    @Override
     public String createDocument(String docId, String mimeType, String displayName)
             throws FileNotFoundException {
         displayName = FileUtils.buildValidFatFilename(displayName);