summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-02-17 18:16:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-17 18:16:37 +0000
commit349f6cee8b29a00b2e52d88749494ab43f49f16c (patch)
tree3a6a1b0a70723764bc6954e5a85fc179db395a40
parente7c714140f0340c39dfca4348debb1ec9e25694e (diff)
parent334917b860fb5e7e7220e9c814c20952502667ee (diff)
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
-rw-r--r--core/java/android/provider/SimPhonebookContract.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/SimPhonebookContract.java b/core/java/android/provider/SimPhonebookContract.java
index f3a78562f73a..074d5f167ec3 100644
--- a/core/java/android/provider/SimPhonebookContract.java
+++ b/core/java/android/provider/SimPhonebookContract.java
@@ -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)) {