Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c368531 authored Apr 12, 2021 by Corina

Rename createContentUriAsUser to createContentUriForUser

Bug: 183395239
Test: atest ContentProviderTest
Change-Id: I13c382e7ad4f291de28a52025a8ec4e59d815409

parent 44763d1b

core/api/module-lib-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ package android.app.usage {
		package android.content {

		public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
		method @NonNull public static android.net.Uri createContentUriAsUser(@NonNull android.net.Uri, @NonNull android.os.UserHandle);
		method @NonNull public static android.net.Uri createContentUriForUser(@NonNull android.net.Uri, @NonNull android.os.UserHandle);
		}

		public abstract class Context {

core/java/android/content/ContentProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2655,7 +2655,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		*/
		@NonNull
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static Uri createContentUriAsUser(
		public static Uri createContentUriForUser(
		@NonNull Uri contentUri, @NonNull UserHandle userHandle) {
		if (!ContentResolver.SCHEME_CONTENT.equals(contentUri.getScheme())) {
		throw new IllegalArgumentException(String.format(

core/tests/coretests/src/android/content/ContentProviderTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -89,9 +89,9 @@ public class ContentProviderTest {
		}

		@Test
		public void testCreateContentUriAsUser() {
		public void testCreateContentUriForUser() {
		Uri uri = Uri.parse("content://com.example/foo/bar");
		Uri expectedUri = Uri.parse("content://7@com.example/foo/bar");
		assertEquals(expectedUri, ContentProvider.createContentUriAsUser(uri, UserHandle.of(7)));
		assertEquals(expectedUri, ContentProvider.createContentUriForUser(uri, UserHandle.of(7)));
		}
		}