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

Commit 0f067e2f authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Remove special handling for length field." into lmp-mr1-dev

parents 191fcbb5 cda4eded

src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ public class UiccCarrierPrivilegeRules extends Handler { 
        public String parseLength(String data) {

            int offset = tag.length();

            int firstByte = Integer.parseInt(data.substring(offset, offset + 2), 16);

            // TODO: remove second condition before launch. b/18012893

            if (firstByte < SINGLE_BYTE_MAX_LENGTH || (offset + 2 + firstByte * 2 == data.length())) {

            if (firstByte < SINGLE_BYTE_MAX_LENGTH) {

                length = firstByte * 2;

                lengthBytes = data.substring(offset, offset + 2);

            } else {