diff options
author | 2016-11-01 14:23:35 -0700 | |
---|---|---|
committer | 2016-11-01 14:25:04 -0700 | |
commit | b00bbc55bce4546492b610790b6fb9be86f7cf9f (patch) | |
tree | 5acfe3fde8db8ecb1ebaf97951b3b5939fe4f74a | |
parent | a5aae5317f7c9450d1be5447f808d3ccbd244743 (diff) |
Rename findPath() API to findDocumentPath().
Bug: 27135972
Change-Id: I13bcfa1abaf9288d38beaa6f1d2329f399cbf3b3
4 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/documentsui/DirectoryLoader.java b/src/com/android/documentsui/DirectoryLoader.java index 8af1ab3a1..9cdc1600d 100644 --- a/src/com/android/documentsui/DirectoryLoader.java +++ b/src/com/android/documentsui/DirectoryLoader.java @@ -103,7 +103,7 @@ public class DirectoryLoader extends AsyncTaskLoader<DirectoryResult> { cursor = new RootCursorWrapper(mUri.getAuthority(), mRoot.rootId, cursor, -1); if (mSearchMode && !Shared.ENABLE_OMC_API_FEATURES) { - // There is no findPath API. Enable filtering on folders in search mode. + // There is no findDocumentPath API. Enable filtering on folders in search mode. cursor = new FilteringCursorWrapper(cursor, null, SEARCH_REJECT_MIMES); } diff --git a/src/com/android/documentsui/DocumentsAccess.java b/src/com/android/documentsui/DocumentsAccess.java index 80d458987..63f235c55 100644 --- a/src/com/android/documentsui/DocumentsAccess.java +++ b/src/com/android/documentsui/DocumentsAccess.java @@ -46,7 +46,7 @@ public interface DocumentsAccess { @Nullable DocumentInfo getArchiveDocument(Uri uri); boolean isDocumentUri(Uri uri); - @Nullable Path findPath(Uri uri) throws RemoteException; + @Nullable Path findDocumentPath(Uri uri) throws RemoteException; List<DocumentInfo> getDocuments(String authority, List<String> docIds) throws RemoteException; @@ -116,11 +116,11 @@ public interface DocumentsAccess { } @Override - public Path findPath(Uri docUri) throws RemoteException { + public Path findDocumentPath(Uri docUri) throws RemoteException { final ContentResolver resolver = mContext.getContentResolver(); try (final ContentProviderClient client = DocumentsApplication .acquireUnstableProviderOrThrow(resolver, docUri.getAuthority())) { - return DocumentsContract.findPath(client, docUri); + return DocumentsContract.findDocumentPath(client, docUri); } } } diff --git a/src/com/android/documentsui/LoadDocStackTask.java b/src/com/android/documentsui/LoadDocStackTask.java index a73945cf1..626b4ffd5 100644 --- a/src/com/android/documentsui/LoadDocStackTask.java +++ b/src/com/android/documentsui/LoadDocStackTask.java @@ -63,11 +63,11 @@ public class LoadDocStackTask extends PairedTask<Activity, Uri, DocumentStack> { final Uri docUri = uris[0]; if (Shared.ENABLE_OMC_API_FEATURES && mDocs.isDocumentUri(docUri)) { try { - final Path path = mDocs.findPath(docUri); + final Path path = mDocs.findDocumentPath(docUri); if (path != null) { return buildStack(docUri.getAuthority(), path); } else { - Log.i(TAG, "Remote provider doesn't support findPath."); + Log.i(TAG, "Remote provider doesn't support findDocumentPath."); } } catch (Exception e) { Log.e(TAG, "Failed to build document stack for uri: " + docUri, e); diff --git a/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java b/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java index fb821ee30..cb8da3045 100644 --- a/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java +++ b/tests/common/com/android/documentsui/testing/TestDocumentsAccess.java @@ -62,7 +62,7 @@ public class TestDocumentsAccess implements DocumentsAccess { } @Override - public Path findPath(Uri docUri) throws RemoteException { + public Path findDocumentPath(Uri docUri) throws RemoteException { return nextPath; } } |