diff options
| author | John Wang <johnwang@google.com> | 2010-09-09 13:39:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-09 13:39:43 -0700 |
| commit | 7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101 (patch) | |
| tree | cdfe5e0f3972e1dba5a5a1e77d872b9002dd2154 | |
| parent | 29c1ac170ea12eb917829bb7ac69f2b8aed03f23 (diff) | |
| parent | 4214c6d7079064ebf283909d45602395e321d9b5 (diff) | |
| download | frameworks_base-7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101.zip frameworks_base-7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101.tar.gz frameworks_base-7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101.tar.bz2 | |
Merge "Fix SimUtilsTest after changing in bcdToString."
| -rw-r--r-- | telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java index db38ede..ef62d85 100644 --- a/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java +++ b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java @@ -28,7 +28,7 @@ public class SimUtilsTest extends TestCase { public void testBasic() throws Exception { byte[] data, data2; - /* + /* * bcdToString() */ @@ -40,9 +40,13 @@ public class SimUtilsTest extends TestCase { assertEquals("0126045001448486", IccUtils.bcdToString(data, 1, data.length - 2)); // Stops on invalid BCD value - data = IccUtils.hexStringToBytes("98F062400510444868f2"); + data = IccUtils.hexStringToBytes("98E062400510444868f2"); assertEquals("890", IccUtils.bcdToString(data, 0, data.length)); + // skip the high nibble 'F' since some PLMNs have it + data = IccUtils.hexStringToBytes("98F062400510444868f2"); + assertEquals("890260450014484862", IccUtils.bcdToString(data, 0, data.length)); + /* * gsmBcdByteToInt() */ |