Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix queryRawContactEntity api" am: b0914ffd45 am: 722b3172ff am: 67b73c4b5e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863059

Change-Id: I40c01c8a77842c435b8380fd589a317aaf56abe9
This commit is contained in:
Treehugger Robot
2021-10-20 21:00:26 +00:00
committed by Automerger Merge Worker
parent 229680564c 67b73c4b5e
commit fff671d660
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/module-lib-current.txt
View File

@@ -312,7 +312,7 @@ package android.os.storage {
package android.provider { package android.provider {
public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns { public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns {
method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static java.util.Map<java.lang.String,java.util.List<android.content.ContentValues>> queryRawContactEntity(@NonNull android.content.Context, long); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static java.util.Map<java.lang.String,java.util.List<android.content.ContentValues>> queryRawContactEntity(@NonNull android.content.ContentResolver, long);
} }
public final class DeviceConfig { public final class DeviceConfig {

4
core/java/android/provider/ContactsContract.java
View File

@@ -5207,7 +5207,7 @@ public final class ContactsContract {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)
public static @NonNull Map<String, List<ContentValues>> queryRawContactEntity( public static @NonNull Map<String, List<ContentValues>> queryRawContactEntity(
@NonNull Context context, long contactId) { @NonNull ContentResolver contentResolver, long contactId) {
Uri uri = RawContactsEntity.CONTENT_URI; Uri uri = RawContactsEntity.CONTENT_URI;
long realContactId = contactId; long realContactId = contactId;
@@ -5225,7 +5225,7 @@ public final class ContactsContract {
final String selection = Data.CONTACT_ID + "=?"; final String selection = Data.CONTACT_ID + "=?";
final String[] selectionArgs = new String[] {String.valueOf(realContactId)}; final String[] selectionArgs = new String[] {String.valueOf(realContactId)};
entityIterator = RawContacts.newEntityIterator(context.getContentResolver().query( entityIterator = RawContacts.newEntityIterator(contentResolver.query(
uri, null, selection, selectionArgs, null)); uri, null, selection, selectionArgs, null));
if (entityIterator == null) { if (entityIterator == null) {