Merge "Merge "Revoke prior uri grants when MediaProvider db gets recreated."... (31f32fa0) · Commits · e / os / android_frameworks_base

core/java/android/provider/DocumentsContract.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -917,8 +917,17 @@ public final class DocumentsContract {
		* @see #getDocumentId(Uri)
		*/
		public static Uri buildDocumentUri(String authority, String documentId) {
		return getBaseDocumentUriBuilder(authority).appendPath(documentId).build();
		}

		/** {@hide} */
		public static Uri buildBaseDocumentUri(String authority) {
		return getBaseDocumentUriBuilder(authority).build();
		}

		private static Uri.Builder getBaseDocumentUriBuilder(String authority) {
		return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
		.authority(authority).appendPath(PATH_DOCUMENT).appendPath(documentId).build();
		.authority(authority).appendPath(PATH_DOCUMENT);
		}

		/**