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

Commit 431f8b94 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong calculation of ota sp Number schema" am: f317537a am: a78dae91 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1459982

Change-Id: I1fa425409739eb586e53105c17d222a29fffec15
parents 505ffc7a a78dae91

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −3
Original line number Diff line number Diff line
@@ -3719,9 +3719,9 @@ public class GsmCdmaPhone extends Phone { 
            // Get how many number of system selection code ranges

            int selRc = Integer.parseInt(sch[1]);

            for (int i = 0; i < selRc; i++) {

                if (!TextUtils.isEmpty(sch[i+2]) && !TextUtils.isEmpty(sch[i+3])) {

                    int selMin = Integer.parseInt(sch[i+2]);

                    int selMax = Integer.parseInt(sch[i+3]);

                if (!TextUtils.isEmpty(sch[i*2+2]) && !TextUtils.isEmpty(sch[i*2+3])) {

                    int selMin = Integer.parseInt(sch[i*2+2]);

                    int selMax = Integer.parseInt(sch[i*2+3]);

                    // Check if the selection code extracted from the dial string falls

                    // within any of the range pairs specified in the schema.

                    if ((sysSelCodeInt >= selMin) && (sysSelCodeInt <= selMax)) {