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

Commit 873e1934 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "In DcTracker when fetching APN setting, specify subId." am: 888fef90 

am: 8dfd39e5

Change-Id: Ic05097c696559c1398ee486048321cdda105289a
parents 79b33c28 8dfd39e5

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

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




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

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

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

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

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

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

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

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





            if (cursor != null) {

            if (cursor != null) {

                if (cursor.getCount() > 0) {

                if (cursor.getCount() > 0) {

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

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

            logd("   sortOrder = " + sortOrder);





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

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

                    || uri.compareTo(Uri.withAppendedPath(

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

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

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

                if (projection == null && selectionArgs == null && selection != null) {

                if (projection == null && selectionArgs == null && selection != null) {





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

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