Merge "Add missing symmetrical ContentResolver method." into rvc-dev (cb31e048) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1771,6 +1771,7 @@ package android.content {
		}

		public abstract class ContentResolver {
		method public int checkUriPermission(@NonNull android.net.Uri, int, int);
		method @NonNull public static android.net.Uri decodeFromFile(@NonNull java.io.File);
		method @NonNull public static java.io.File encodeToFile(@NonNull android.net.Uri);
		method @Nullable @RequiresPermission("android.permission.CACHE_CONTENT") public android.os.Bundle getCache(@NonNull android.net.Uri);

+4 −0

Original line number	Diff line number	Diff line
		@@ -1585,6 +1585,10 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		* This method is typically used when the provider implements more dynamic
		* access controls that cannot be expressed with {@code <path-permission>}
		* style static rules.
		* <p>
		* Because validation of these dynamic access controls has significant
		* system health impact, this feature is only available to providers that
		* are built into the system.
		*
		* @param uri the {@link Uri} to perform an access check on.
		* @param uid the UID to check the permission for.

+21 −1

Original line number	Diff line number	Diff line
		@@ -1357,8 +1357,28 @@ public abstract class ContentResolver implements ContentInterface {
		}
		}

		/** {@hide} */
		/**
		* Perform a detailed internal check on a {@link Uri} to determine if a UID
		* is able to access it with specific mode flags.
		* <p>
		* This method is typically used when the provider implements more dynamic
		* access controls that cannot be expressed with {@code <path-permission>}
		* style static rules.
		* <p>
		* Because validation of these dynamic access controls has significant
		* system health impact, this feature is only available to providers that
		* are built into the system.
		*
		* @param uri the {@link Uri} to perform an access check on.
		* @param uid the UID to check the permission for.
		* @param modeFlags the access flags to use for the access check, such as
		* {@link Intent#FLAG_GRANT_READ_URI_PERMISSION}.
		* @return {@link PackageManager#PERMISSION_GRANTED} if access is allowed,
		* otherwise {@link PackageManager#PERMISSION_DENIED}.
		* @hide
		*/
		@Override
		@SystemApi
		public int checkUriPermission(@NonNull Uri uri, int uid, @Intent.AccessUriMode int modeFlags) {
		Objects.requireNonNull(uri, "uri");