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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc6093e1ac681fe4d9e30ef54f4947ff645a511d
This commit is contained in:
Colin Cross
2021-02-17 18:52:37 +00:00
committed by Automerger Merge Worker

View File

@@ -262,7 +262,7 @@ public final class SimPhonebookContract {
@WorkerThread
public static int getEncodedNameLength(
@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,
null);
if (result == null || !result.containsKey(EXTRA_ENCODED_NAME_LENGTH)) {