Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d01766d authored by Josh Hou's avatar Josh Hou Committed by android-build-merger
Browse files

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

am: 2dd4daa3

Change-Id: I90030da1591c81f63f8c58bdb3182dd87e0327f6
parents 0af4e0f9 2dd4daa3

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

+1 −1
Original line number Diff line number Diff line
@@ -3188,7 +3188,7 @@ public class DcTracker extends Handler { 


        // 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

+3 −1
Original line number Diff line number Diff line
@@ -208,7 +208,9 @@ public class DcTrackerTest extends TelephonyTest { 


            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");