From 8ab5cf670ff2463e187b18f6faa83a9842f1ed5d Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Wed, 17 Feb 2021 18:27:59 +0900
Subject: [PATCH] Fix self-assign error in SimPhonebookContract

Bug: 180472752
Test: atest
FrameworksTelephonyTests: com.android.internal.telephony.uicc.IccUtilsTest
TeleServiceTests: SimPhonebookProviderTest
Change-Id: I1a8c0dabee3ca90fcdeca263a4c943e01fbae75e
---
 core/java/android/provider/SimPhonebookContract.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/provider/SimPhonebookContract.java b/core/java/android/provider/SimPhonebookContract.java
index f3a78562f73a8..074d5f167ec30 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)) {