From 616db6313968db7c1307c906fc24f01f091ee3d5 Mon Sep 17 00:00:00 2001
From: Matt Garnes <matt@cyngn.com>
Date: Thu, 18 Jun 2015 17:40:23 -0700
Subject: [PATCH] Fix incorrect retrieval of SIM Network Operator.

We were incorrectly passing the phone ID to TelephonyManager instead of
the subscription ID. Pass the correct identifier to retrieve the network
operator name.

Change-Id: I266d2ce39c72db6e97eff5a36c5fec6242d516cc
(cherry picked from commit b31cb54361435f2abf63fd102f9df9dd8fdd08c3)
---
 src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
index 3950d742..af123e08 100644
--- a/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/ChooseDataSimPage.java
@@ -262,7 +262,7 @@ public class ChooseDataSimPage extends SetupPage {
 
         private void updateCarrierText(SubscriptionInfo subInfoRecord) {
             if (mIsAttached) {
-                String name = mPhone.getNetworkOperatorName(subInfoRecord.getSimSlotIndex());
+                String name = mPhone.getNetworkOperatorName(subInfoRecord.getSubscriptionId());
                 ServiceState serviceState = mServiceStates.get(subInfoRecord.getSimSlotIndex());
                 if (TextUtils.isEmpty(name)) {
                     if (serviceState != null && serviceState.isEmergencyOnly()) {