diff options
| author | Colin Cross <ccross@android.com> | 2021-02-17 18:52:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 18:52:37 +0000 |
| commit | c51c2171bbd4cf5423b4ade4411bcaf95e8469d9 (patch) | |
| tree | d716946d3a025224038f9ef06483edabfbe00bb9 /core/java/android | |
| parent | 5dc739628424cbe719f4f56df061686a68968523 (diff) | |
| parent | 349f6cee8b29a00b2e52d88749494ab43f49f16c (diff) | |
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
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/SimPhonebookContract.java | 2 |
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)) { |