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

Commit 2b0c571b authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "In DcTracker when fetching APN setting, specify subId."

parents 35e2478b 580aa32e

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

+2 −2
Original line number Diff line number Diff line
@@ -3195,8 +3195,8 @@ public class DcTracker extends Handler { 


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

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

                Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "filtered"),

                null, null, null, Telephony.Carriers._ID);

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

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



        if (cursor != null) {

            while (cursor.moveToNext()) {

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

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ public class DcTrackerTest extends TelephonyTest { 
            logd("   sortOrder = " + sortOrder);



            if (uri.compareTo(Telephony.Carriers.CONTENT_URI) == 0

                    || uri.compareTo(Uri.withAppendedPath(

                            Telephony.Carriers.CONTENT_URI, "filtered")) == 0) {

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

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

                if (projection == null) {



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