aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-05-30 15:01:03 -0700
committerRoman Birg <roman@cyngn.com>2016-06-06 11:51:27 -0700
commita94ae667a6cefaef2f4c87787dafabdd5458f047 (patch)
tree7130f617320869925dacf85e79af3532de79896f
parent514c79b5fe79eeda4d63066035dac03cf8af14a1 (diff)
downloadandroid_frameworks_opt_telephony-a94ae667a6cefaef2f4c87787dafabdd5458f047.tar.gz
android_frameworks_opt_telephony-a94ae667a6cefaef2f4c87787dafabdd5458f047.tar.bz2
android_frameworks_opt_telephony-a94ae667a6cefaef2f4c87787dafabdd5458f047.zip
DcTracker: use IMSI with APN lookup
Ticket: PAELLA-158 Change-Id: Id805a8ef16a1054dac0bd2b3f3b83a32d4502eea Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r--src/java/com/android/internal/telephony/dataconnection/DcTracker.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 7c1e8d8d1..9295b9113 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -135,6 +135,8 @@ public class DcTracker extends DcTrackerBase {
static final Uri PREFERAPN_NO_UPDATE_URI_USING_SUBID =
Uri.parse("content://telephony/carriers/preferapn_no_update/subId/");
+ static final Uri PREFERAPN_NO_UPDATE_URI_USING_SUBID_IMSI =
+ Uri.parse("content://telephony/carriers/preferapn_no_update/subIdImsi/");
static final String APN_ID = "apn_id";
/**
@@ -2762,7 +2764,9 @@ public class DcTracker extends DcTrackerBase {
}
String subId = Long.toString(mPhone.getSubId());
- Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID, subId);
+ String imsi = mPhone.getSubscriberId();
+ Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID_IMSI, subId);
+ uri = Uri.withAppendedPath(uri, imsi);
log("setPreferredApn: delete");
ContentResolver resolver = mPhone.getContext().getContentResolver();
resolver.delete(uri, null, null);
@@ -2782,7 +2786,9 @@ public class DcTracker extends DcTrackerBase {
}
String subId = Long.toString(mPhone.getSubId());
- Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID, subId);
+ String imsi = mPhone.getSubscriberId();
+ Uri uri = Uri.withAppendedPath(PREFERAPN_NO_UPDATE_URI_USING_SUBID_IMSI, subId);
+ uri = Uri.withAppendedPath(uri, imsi);
Cursor cursor = mPhone.getContext().getContentResolver().query(
uri, new String[] { "_id", "name", "apn" },
null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);