Merge "When restoring APNs, getApns takes a subId arg"
am: fc10d0a4e4
Change-Id: Ic92361122576ece20426861014db53f79bae0338
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 2eca2e5..58e8b4a 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2250,7 +2250,7 @@
return s_apnSourceServiceExists;
}
- private void restoreApnsWithService() {
+ private void restoreApnsWithService(int subId) {
Context context = getContext();
Resources r = context.getResources();
ServiceConnection connection = new ServiceConnection() {
@@ -2289,7 +2289,7 @@
}
}
try {
- ContentValues[] values = mIApnSourceService.getApns();
+ ContentValues[] values = mIApnSourceService.getApns(subId);
if (values != null) {
// we use the unsynchronized insert because this function is called
// within the syncrhonized function delete()
@@ -3558,7 +3558,7 @@
editorApn.apply();
if (apnSourceServiceExists(getContext())) {
- restoreApnsWithService();
+ restoreApnsWithService(subId);
} else {
initDatabaseWithDatabaseHelper(db);
}