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

Commit 888fef90 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

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

parents a65a0672 bd4b9c74

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

+2 −2
Original line number Diff line number Diff line
@@ -3245,8 +3245,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, selection, null, Telephony.Carriers._ID);

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

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



            if (cursor != null) {

                if (cursor.getCount() > 0) {

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

+2 −2
Original line number Diff line number Diff line
@@ -208,8 +208,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 && selectionArgs == null && selection != null) {



                    Pattern pattern = Pattern.compile("^numeric = '([0-9]*)'");