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

Merge "Fix self-assign error in SimPhonebookContract" am: 334917b860 am: 349f6cee8b am: c51c2171bb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e872be0ac1d4bd4d24cdde2b9d3ed3ba02e71f3
This commit is contained in:
Colin Cross
2021-02-17 19:46:56 +00:00
committed by Automerger Merge Worker
parent a418947cfa c51c2171bb
commit cad1bd63fb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/SimPhonebookContract.java
View File

@@ -262,7 +262,7 @@ public final class SimPhonebookContract {
@WorkerThread @WorkerThread
public static int getEncodedNameLength( public static int getEncodedNameLength(
@NonNull ContentResolver resolver, @NonNull String name) { @NonNull ContentResolver resolver, @NonNull String name) {
name = Objects.requireNonNull(name); Objects.requireNonNull(name);
Bundle result = resolver.call(AUTHORITY, GET_ENCODED_NAME_LENGTH_METHOD_NAME, name, Bundle result = resolver.call(AUTHORITY, GET_ENCODED_NAME_LENGTH_METHOD_NAME, name,
null); null);
if (result == null || !result.containsKey(EXTRA_ENCODED_NAME_LENGTH)) { if (result == null || !result.containsKey(EXTRA_ENCODED_NAME_LENGTH)) {