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

Commit fff671d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix queryRawContactEntity api" am: b0914ffd am: 722b3172 am: 67b73c4b 

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

Change-Id: I40c01c8a77842c435b8380fd589a317aaf56abe9
parents 22968056 67b73c4b

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ package android.os.storage { 
package android.provider {



  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 {

core/java/android/provider/ContactsContract.java

+2 −2
Original line number Diff line number Diff line
@@ -5207,7 +5207,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;
@@ -5225,7 +5225,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) {