diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-20 21:34:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-20 21:34:32 +0000 |
| commit | cb0a628afc7ce178443304d544463683dd3e1c7f (patch) | |
| tree | 105064f38bc9cd46abca9f620e1c17890aa7d8d3 /core/java/android | |
| parent | 1627580220fefd6d4723fa7373fdff312bf6bec5 (diff) | |
| parent | f4458283e066bea1994b1131a8d5974d73a2eb7e (diff) | |
Merge "Fix queryRawContactEntity api" am: b0914ffd45 am: 722b3172ff am: 67b73c4b5e am: fff671d660 am: f4458283e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863059
Change-Id: I39d0d03036bac02f1601f6bc21d138a64e37d202
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index d5449154347a..f8aa98e710c9 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5201,7 +5201,7 @@ public final class ContactsContract { @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static @NonNull Map<String, List<ContentValues>> queryRawContactEntity( - @NonNull Context context, long contactId) { + @NonNull ContentResolver contentResolver, long contactId) { Uri uri = RawContactsEntity.CONTENT_URI; long realContactId = contactId; @@ -5219,7 +5219,7 @@ public final class ContactsContract { final String selection = Data.CONTACT_ID + "=?"; final String[] selectionArgs = new String[] {String.valueOf(realContactId)}; - entityIterator = RawContacts.newEntityIterator(context.getContentResolver().query( + entityIterator = RawContacts.newEntityIterator(contentResolver.query( uri, null, selection, selectionArgs, null)); if (entityIterator == null) { |