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

am aa800609: Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev

Browse Source 
* commit 'aa800609304b4787091b1805b2439423b3192bb1':
  Added Multi-SIM capability to Access Point Names
This commit is contained in:
PauloftheWest
2014-12-09 23:17:50 +00:00
committed by Android Git Automerger
parent bfb8449aea aa80060930
commit 58a73bbc0a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Telephony; import android.provider.Telephony;
import android.telephony.SubscriptionInfo;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@@ -88,6 +89,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
private RestoreApnUiHandler mRestoreApnUiHandler; private RestoreApnUiHandler mRestoreApnUiHandler;
private RestoreApnProcessHandler mRestoreApnProcessHandler; private RestoreApnProcessHandler mRestoreApnProcessHandler;
private HandlerThread mRestoreDefaultApnThread; private HandlerThread mRestoreDefaultApnThread;
private SubscriptionInfo mSubscriptionInfo;
private UserManager mUm; private UserManager mUm;
@@ -128,6 +130,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
final Activity activity = getActivity();
final int subId = activity.getIntent().getIntExtra("sub_id", -1);
mUm = (UserManager) getSystemService(Context.USER_SERVICE); mUm = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -137,6 +141,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements
if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) { if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
mSubscriptionInfo = Utils.findRecordBySubId(activity, subId);
} }
@Override @Override
@@ -196,8 +202,11 @@ public class ApnSettings extends SettingsPreferenceFragment implements
} }
private void fillList() { private void fillList() {
String where = "numeric=\"" final String mccmnc = mSubscriptionInfo == null ? ""
+ android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "") : Integer.toString(mSubscriptionInfo.getMcc())
+ Integer.toString(mSubscriptionInfo.getMnc());
final String where = "numeric=\""
+ mccmnc
+ "\""; + "\"";
Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] { Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {