diff options
author | Sanket Padawe <sanketpadawe@google.com> | 2014-12-17 19:31:30 -0800 |
---|---|---|
committer | Sanket Padawe <sanketpadawe@google.com> | 2014-12-17 19:31:30 -0800 |
commit | 579b66f28da710b5a1e68e211f5bd54ea466ab8b (patch) | |
tree | 7ae35b29f5e59e64df0e6e4988621fc134cc751b /src/com/android/settings/ApnSettings.java | |
parent | b0c8c3935d5842cfefbe96d958d537fb80d4a33e (diff) | |
download | packages_apps_Settings-579b66f28da710b5a1e68e211f5bd54ea466ab8b.zip packages_apps_Settings-579b66f28da710b5a1e68e211f5bd54ea466ab8b.tar.gz packages_apps_Settings-579b66f28da710b5a1e68e211f5bd54ea466ab8b.tar.bz2 |
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug: 18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
Diffstat (limited to 'src/com/android/settings/ApnSettings.java')
-rw-r--r-- | src/com/android/settings/ApnSettings.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index db5449f..9de329c 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -53,6 +53,7 @@ import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; +import android.telephony.TelephonyManager; import java.util.ArrayList; @@ -131,7 +132,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements public void onCreate(Bundle icicle) { super.onCreate(icicle); final Activity activity = getActivity(); - final int subId = activity.getIntent().getIntExtra("sub_id", -1); + // Fixme: Workaround for single sim device. + mSubscriptionInfo = Utils.findRecordBySlotId(activity, 0); mUm = (UserManager) getSystemService(Context.USER_SERVICE); @@ -142,7 +144,6 @@ public class ApnSettings extends SettingsPreferenceFragment implements setHasOptionsMenu(true); } - mSubscriptionInfo = Utils.findRecordBySubId(activity, subId); } @Override @@ -202,9 +203,10 @@ public class ApnSettings extends SettingsPreferenceFragment implements } private void fillList() { + final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); final String mccmnc = mSubscriptionInfo == null ? "" - : Integer.toString(mSubscriptionInfo.getMcc()) - + Integer.toString(mSubscriptionInfo.getMnc()); + : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId()); + Log.d(TAG, "mccmnc = " + mccmnc); final String where = "numeric=\"" + mccmnc + "\""; |