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

Merge "Fix NullPointerException to get sim accounts" am: 8b70a6bfad am: 78522e8931 am: f85eb899ca

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

Change-Id: I93acce58c1d7f3b933595b993eaab7166488f1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Marcus Hagerott
2023-03-30 19:36:14 +00:00
committed by Automerger Merge Worker
parent ac5f86e600 f85eb899ca
commit 9b279fbc71
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8434,7 +8434,7 @@ public final class ContactsContract {
extras.putString(KEY_ACCOUNT_NAME, accountName);
extras.putString(KEY_ACCOUNT_TYPE, accountType);
contentResolver.call(ContactsContract.AUTHORITY_URI,
nullSafeCall(contentResolver, ContactsContract.AUTHORITY_URI,
ContactsContract.SimContacts.ADD_SIM_ACCOUNT_METHOD,
null, extras);
}
@@ -8457,7 +8457,7 @@ public final class ContactsContract {
Bundle extras = new Bundle();
extras.putInt(KEY_SIM_SLOT_INDEX, simSlotIndex);
contentResolver.call(ContactsContract.AUTHORITY_URI,
nullSafeCall(contentResolver, ContactsContract.AUTHORITY_URI,
ContactsContract.SimContacts.REMOVE_SIM_ACCOUNT_METHOD,
null, extras);
}
@@ -8469,7 +8469,7 @@ public final class ContactsContract {
*/
public static @NonNull List<SimAccount> getSimAccounts(
@NonNull ContentResolver contentResolver) {
Bundle response = contentResolver.call(ContactsContract.AUTHORITY_URI,
Bundle response = nullSafeCall(contentResolver, ContactsContract.AUTHORITY_URI,
ContactsContract.SimContacts.QUERY_SIM_ACCOUNTS_METHOD,
null, null);
List<SimAccount> result = response.getParcelableArrayList(KEY_SIM_ACCOUNTS, android.provider.ContactsContract.SimAccount.class);
@@ -9088,7 +9088,8 @@ public final class ContactsContract {
* @param contactId the id of the contact to undemote.
*/
public static void undemote(ContentResolver contentResolver, long contactId) {
contentResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
nullSafeCall(contentResolver, ContactsContract.AUTHORITY_URI,
PinnedPositions.UNDEMOTE_METHOD,
String.valueOf(contactId), null);
}
@@ -10300,4 +10301,13 @@ public final class ContactsContract {
public static final String CONTENT_ITEM_TYPE =
"vnd.android.cursor.item/contact_metadata_sync_state";
}
private static Bundle nullSafeCall(@NonNull ContentResolver resolver, @NonNull Uri uri,
@NonNull String method, @Nullable String arg, @Nullable Bundle extras) {
try (ContentProviderClient client = resolver.acquireContentProviderClient(uri)) {
return client.call(method, arg, extras);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
}
}