commit 28c934ad3965276d9131d6087cd5245a27d3b4f6
author Josh Hou <joshhou@google.com> Mon Dec 10 21:58:13 2018 +0800
committer Josh Hou <joshhou@google.com> Tue Dec 11 12:16:23 2018 +0000
tree 4be479eb228ee23b1e8a69e4ac52e5b5779d8b27
parent 477570a19739ece23fe96842e1f4fa953b28f276

Add carriers/sim_apn_list/filtered/subId url to fetch APNs of current SIM

Revert carriers/filtered to the original design and add
carriers/sim_apn_list/filtered/subId url to fetch APNs of current SIM

Bug: 115709816
Test: 1.Live network test, 2.DcTrackerTest
Change-Id: I76ae258ba3f653480e4805ed7edc3ede23f633af
Merged-In: I76ae258ba3f653480e4805ed7edc3ede23f633af

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 26284c1..5cc7158 100755
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -3188,7 +3188,7 @@
 
         // ORDER BY Telephony.Carriers._ID ("_id")
         Cursor cursor = mPhone.getContext().getContentResolver().query(
-                Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "filtered/subId/"
+                Uri.withAppendedPath(Telephony.Carriers.SIM_APN_LIST, "filtered/subId/"
                         + mPhone.getSubId()), null, null, null, Telephony.Carriers._ID);
 
         if (cursor != null) {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
index 04e9305..12c87e0 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
@@ -208,7 +208,9 @@
 
             if (uri.compareTo(Telephony.Carriers.CONTENT_URI) == 0
                     || uri.toString().startsWith(Uri.withAppendedPath(
-                            Telephony.Carriers.CONTENT_URI, "filtered").toString())) {
+                            Telephony.Carriers.CONTENT_URI, "filtered").toString())
+                    || uri.toString().startsWith(Uri.withAppendedPath(
+                            Telephony.Carriers.SIM_APN_LIST, "filtered").toString())) {
                 if (projection == null) {
 
                     logd("Query '" + FAKE_PLMN + "' APN settings");