diff options
| author | 2021-04-13 16:43:00 +0000 | |
|---|---|---|
| committer | 2021-04-13 16:43:00 +0000 | |
| commit | 5b4e1622b76ddce6cf23ea483db5d1905a7a1664 (patch) | |
| tree | 3a4c0ad106c09cc1ccfbefd3e2028916807363b3 | |
| parent | aec8866a37117511813ca64431534caed26eda6a (diff) | |
| parent | 7c368531a4e2004511473a7c172a2ae8454cc18f (diff) | |
Merge "Rename createContentUriAsUser to createContentUriForUser" into sc-dev
| -rw-r--r-- | core/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/content/ContentProviderTest.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 81a56e6dba38..b1e448b7dd77 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -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 { diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 82842039c310..7e1df1b0e59c 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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( diff --git a/core/tests/coretests/src/android/content/ContentProviderTest.java b/core/tests/coretests/src/android/content/ContentProviderTest.java index b28206402137..ceebc621f51f 100644 --- a/core/tests/coretests/src/android/content/ContentProviderTest.java +++ b/core/tests/coretests/src/android/content/ContentProviderTest.java @@ -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))); } } |