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

Commit 7e8eb60c authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge "Trim Empty PLMNs from the list of parsed PLMNs" am: 5f84fc93

am: 654f7ec6

Change-Id: I17352a97e0f513d0c48ae4a0031ddcedda139406
parents 3ebb441c 654f7ec6
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -2072,10 +2072,14 @@ public class SIMRecords extends IccRecords {
            return null;
        }
        int numPlmns = data.length / packedBcdPlmnLenBytes;
        String[] ret = new String[numPlmns];
        int numValidPlmns = 0;
        String[] parsed = new String[numPlmns];
        for (int i = 0; i < numPlmns; i++) {
            ret[i] = IccUtils.bcdPlmnToString(data, i * packedBcdPlmnLenBytes);
            parsed[numValidPlmns] = IccUtils.bcdPlmnToString(data, i * packedBcdPlmnLenBytes);
            // we count the valid (non empty) records and only increment if valid
            if (!TextUtils.isEmpty(parsed[numValidPlmns])) numValidPlmns++;
        }
        String[] ret = Arrays.copyOf(parsed, numValidPlmns);
        if (VDBG) logv(description + " PLMNs: " + Arrays.toString(ret));
        return ret;
    }