PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Getting mcc/mnc from system prop instead of subInfoRecord."

Browse Source 
This reverts commit 579b66f28d.

Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
This commit is contained in:
Sanket Padawe
2014-12-18 06:24:36 +00:00
parent 579b66f28d
commit 4be06d9c48
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ApnSettings.java
View File

@@ -53,7 +53,6 @@ import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties; import com.android.internal.telephony.TelephonyProperties;
import android.telephony.TelephonyManager;
import java.util.ArrayList; import java.util.ArrayList;
@@ -132,8 +131,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
final Activity activity = getActivity(); final Activity activity = getActivity();
// Fixme: Workaround for single sim device. final int subId = activity.getIntent().getIntExtra("sub_id", -1);
mSubscriptionInfo = Utils.findRecordBySlotId(activity, 0);
mUm = (UserManager) getSystemService(Context.USER_SERVICE); mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -144,6 +142,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
} }
@Override @Override
@@ -203,10 +202,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements
} }
private void fillList() { private void fillList() {
final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
final String mccmnc = mSubscriptionInfo == null ? "" final String mccmnc = mSubscriptionInfo == null ? ""
: tm.getSimOperator(mSubscriptionInfo.getSubscriptionId()); : Integer.toString(mSubscriptionInfo.getMcc())
Log.d(TAG, "mccmnc = " + mccmnc); + Integer.toString(mSubscriptionInfo.getMnc());
final String where = "numeric=\"" final String where = "numeric=\""
+ mccmnc + mccmnc
+ "\""; + "\"";