From d415e168220d96f6423bba6b11926fd951aa80e4 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Sat, 18 Jul 2020 01:25:01 +0800
Subject: [PATCH] [Settings] Provide carrier name when manual network select

Manual network select need to have carrier name in order to
display to the user when failure.

Bug: 161425622
Test: manual
Change-Id: Ib77c14273bc9b9ea17c41cdd40f7bad0af4abc93
(cherry picked from commit bdd5e86974f321abc56181061e98accb2d5e1cc6)
---
 .../network/telephony/NetworkOperatorPreference.java   | 10 ++++++++++
 .../network/telephony/NetworkSelectSettings.java       |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index 97894b1aded..0a9c9b9eaee 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -37,6 +37,7 @@ import android.util.Log;
 
 import androidx.preference.Preference;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 
 import java.util.List;
@@ -175,6 +176,15 @@ public class NetworkOperatorPreference extends Preference {
         return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric());
     }
 
+    /**
+     * Operator info of this cell
+     */
+    public OperatorInfo getOperatorInfo() {
+        return new OperatorInfo(Objects.toString(mCellId.getOperatorAlphaLong(), ""),
+                Objects.toString(mCellId.getOperatorAlphaShort(), ""),
+                getOperatorNumeric());
+    }
+
     private int getIconIdForCell(CellInfo ci) {
         if (ci instanceof CellInfoGsm) {
             return R.drawable.signal_strength_g;
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 3f18928f9a4..e0d1c1ea2e4 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -40,6 +40,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
@@ -185,12 +186,12 @@ public class NetworkSelectSettings extends DashboardFragment {
 
             mRequestIdManualNetworkSelect = getNewRequestId();
             mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
-            final String operatorNumeric = mSelectedPreference.getOperatorNumeric();
+            final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
             ThreadUtils.postOnBackgroundThread(() -> {
                 final Message msg = mHandler.obtainMessage(
                         EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
                 msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
-                        operatorNumeric, true /* persistSelection */);
+                        operator, true /* persistSelection */);
                 msg.sendToTarget();
             });
         }