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

Merge "Fix cannot build prefer or restore APN for Secondary SIM/Sub."

Browse Source 
am: 5620699fb9

* commit '5620699fb99cd4f56c9956e6a2cab99bab0126f8':
  Fix cannot build prefer or restore APN for Secondary SIM/Sub.

Change-Id: Ib5c1c6deb878d91f684c4cd8ff4151d8dbb562a5
This commit is contained in:
Yifan Bai
2016-05-13 16:52:14 +00:00
committed by android-build-merger
parent 5213f71536 5620699fb9
commit 1545987bec
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,14 +393,14 @@ public class ApnSettings extends SettingsPreferenceFragment implements
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(APN_ID, mSelectedKey); values.put(APN_ID, mSelectedKey);
resolver.update(PREFERAPN_URI, values, null, null); resolver.update(getUriForCurrSubId(PREFERAPN_URI), values, null, null);
} }
private String getSelectedApnKey() { private String getSelectedApnKey() {
String key = null; String key = null;
Cursor cursor = getContentResolver().query(PREFERAPN_URI, new String[] {"_id"}, Cursor cursor = getContentResolver().query(getUriForCurrSubId(PREFERAPN_URI),
null, null, Telephony.Carriers.DEFAULT_SORT_ORDER); new String[] {"_id"}, null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
if (cursor.getCount() > 0) { if (cursor.getCount() > 0) {
cursor.moveToFirst(); cursor.moveToFirst();
key = cursor.getString(ID_INDEX); key = cursor.getString(ID_INDEX);
@@ -431,6 +431,17 @@ public class ApnSettings extends SettingsPreferenceFragment implements
return true; return true;
} }
// Append subId to the Uri
private Uri getUriForCurrSubId(Uri uri) {
int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
: SubscriptionManager.INVALID_SUBSCRIPTION_ID;
if (SubscriptionManager.isValidSubscriptionId(subId)) {
return Uri.withAppendedPath(uri, "subId/" + String.valueOf(subId));
} else {
return uri;
}
}
private class RestoreApnUiHandler extends Handler { private class RestoreApnUiHandler extends Handler {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
@@ -468,7 +479,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
switch (msg.what) { switch (msg.what) {
case EVENT_RESTORE_DEFAULTAPN_START: case EVENT_RESTORE_DEFAULTAPN_START:
ContentResolver resolver = getContentResolver(); ContentResolver resolver = getContentResolver();
resolver.delete(DEFAULTAPN_URI, null, null); resolver.delete(getUriForCurrSubId(DEFAULTAPN_URI), null, null);
mRestoreApnUiHandler mRestoreApnUiHandler
.sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE); .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
break; break;