diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-02-17 19:49:13 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-02-19 19:56:07 -0800 |
| commit | 8d1a3d1198cd403391738896c5d313b49be7b9bc (patch) | |
| tree | b795bb22a26d64a07eba34e7e06e882fa1e10b78 | |
| parent | 37197c854c7c3791ee3d26dad7219ceb68f40a32 (diff) | |
| download | android_frameworks_opt_telephony-8d1a3d1198cd403391738896c5d313b49be7b9bc.tar.gz android_frameworks_opt_telephony-8d1a3d1198cd403391738896c5d313b49be7b9bc.tar.bz2 android_frameworks_opt_telephony-8d1a3d1198cd403391738896c5d313b49be7b9bc.zip | |
Revert "Remove special handling for length field."
This reverts commit cda4eded9861bea93e2467bdd65fc7ba8b41dfc9.
This will be reverted after submission
Bug: 18012893
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java index 0aec4d1c7..5b3c0963e 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java +++ b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java @@ -161,7 +161,8 @@ public class UiccCarrierPrivilegeRules extends Handler { public String parseLength(String data) { int offset = tag.length(); int firstByte = Integer.parseInt(data.substring(offset, offset + 2), 16); - if (firstByte < SINGLE_BYTE_MAX_LENGTH) { + // TODO: remove second condition before launch. b/18012893 + if (firstByte < SINGLE_BYTE_MAX_LENGTH || (offset + 2 + firstByte * 2 == data.length())) { length = firstByte * 2; lengthBytes = data.substring(offset, offset + 2); } else { |