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

am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev

Browse Source 
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
  Change to add user_visible field to Carriers table.
This commit is contained in:
Amit Mahajan
2015-10-14 23:49:08 +00:00
committed by Android Git Automerger
parent 38fc400ac9 f20d51f3b0
commit 7b99029832
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
private boolean mUnavailable; private boolean mUnavailable;
private boolean mHideImsApn; private boolean mHideImsApn;
private boolean mAllowAddingApns;
private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() { private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
@Override @Override
@@ -171,6 +172,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
getSystemService(Context.CARRIER_CONFIG_SERVICE); getSystemService(Context.CARRIER_CONFIG_SERVICE);
PersistableBundle b = configManager.getConfig(); PersistableBundle b = configManager.getConfig();
mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL); mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
} }
@Override @Override
@@ -235,16 +237,16 @@ public class ApnSettings extends SettingsPreferenceFragment implements
final String mccmnc = mSubscriptionInfo == null ? "" final String mccmnc = mSubscriptionInfo == null ? ""
: tm.getSimOperator(mSubscriptionInfo.getSubscriptionId()); : tm.getSimOperator(mSubscriptionInfo.getSubscriptionId());
Log.d(TAG, "mccmnc = " + mccmnc); Log.d(TAG, "mccmnc = " + mccmnc);
String where = "numeric=\"" StringBuilder where = new StringBuilder("numeric=\"" + mccmnc +
+ mccmnc "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND user_visible!=0");
+ "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL))";
if (mHideImsApn) { if (mHideImsApn) {
where = where + " AND NOT (type='ims')"; where.append(" AND NOT (type='ims')");
} }
Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] { Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
"_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where, null, "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where.toString(),
Telephony.Carriers.DEFAULT_SORT_ORDER); null, Telephony.Carriers.DEFAULT_SORT_ORDER);
if (cursor != null) { if (cursor != null) {
IccRecords r = null; IccRecords r = null;
@@ -326,10 +328,12 @@ public class ApnSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
if (!mUnavailable) { if (!mUnavailable) {
if (mAllowAddingApns) {
menu.add(0, MENU_NEW, 0, menu.add(0, MENU_NEW, 0,
getResources().getString(R.string.menu_new)) getResources().getString(R.string.menu_new))
.setIcon(android.R.drawable.ic_menu_add) .setIcon(android.R.drawable.ic_menu_add)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
menu.add(0, MENU_RESTORE, 0, menu.add(0, MENU_RESTORE, 0,
getResources().getString(R.string.menu_restore)) getResources().getString(R.string.menu_restore))
.setIcon(android.R.drawable.ic_menu_upload); .setIcon(android.R.drawable.ic_menu_upload);