From 27d969bb48807ff2a01c608e3babb615af7d9f73 Mon Sep 17 00:00:00 2001
From: SongFerng Wang <songferngwang@google.com>
Date: Mon, 7 Oct 2024 07:34:12 +0000
Subject: [PATCH] Refactor the getCurrentCarrierNameForDisplay

Bug: 370884447
Change-Id: I4abfbd520297e5c000984fcd5b6a2ad4db9a35e9
Test: NA
Flag: EXEMPT bugfix
---
 .../settings/network/telephony/MobileNetworkUtils.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 235418ebb55..82083b534b8 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -610,12 +610,8 @@ public class MobileNetworkUtils {
     }
 
     public static CharSequence getCurrentCarrierNameForDisplay(Context context) {
-        final SubscriptionInfo subInfo = getSubscriptionInfo(context,
+        return getCurrentCarrierNameForDisplay(context,
                 SubscriptionManager.getDefaultSubscriptionId());
-        if (subInfo != null) {
-            return subInfo.getCarrierName();
-        }
-        return getOperatorNameFromTelephonyManager(context);
     }
 
     private static @Nullable SubscriptionInfo getSubscriptionInfo(Context context, int subId) {