Merge "Rename findPath() API to findDocumentPath()." into nyc-andromeda-dev (4038feae) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/DirectoryLoader.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}