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

Commit b6c859c3 authored by Calvin Pan's avatar Calvin Pan Committed by android-build-merger
Browse files

Merge "Rename SIM_APN_LIST to SIM_APN_LIST_URI" 

am: 73cf902e

Change-Id: I44f4fc38c14d96933a4369f7c1ef5ba580a3db1c
parents 656482b4 73cf902e

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

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


        // ORDER BY Telephony.Carriers._ID ("_id")

        Cursor cursor = mPhone.getContext().getContentResolver().query(

                Uri.withAppendedPath(Telephony.Carriers.SIM_APN_LIST, "filtered/subId/"

                Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI, "filtered/subId/"

                        + mPhone.getSubId()), null, null, null, Telephony.Carriers._ID);



        if (cursor != null) {

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ public class DcTrackerTest extends TelephonyTest { 
                    || uri.toString().startsWith(Uri.withAppendedPath(

                            Telephony.Carriers.CONTENT_URI, "filtered").toString())

                    || uri.toString().startsWith(Uri.withAppendedPath(

                            Telephony.Carriers.SIM_APN_LIST, "filtered").toString())) {

                            Telephony.Carriers.SIM_APN_URI, "filtered").toString())) {

                if (projection == null) {



                    logd("Query '" + FAKE_PLMN + "' APN settings");