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

Commit 654f7ec6 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

Change-Id: Ib7a8f2ca7522b5dff93e6828e58ff8882492dd69
parents 9aca3cb2 5f84fc93
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;
    }