Merge "Fix self-assign error in SimPhonebookContract" am: 334917b860
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591459 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18353c628701fe19c47353bdd46c44f94fd081bd
This commit is contained in:
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user