diff options
| author | Kenny Root <kroot@google.com> | 2010-02-17 12:02:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-17 12:02:35 -0800 |
| commit | 433735f8719b418cb56133bf4862db68a96fbc70 (patch) | |
| tree | b6618d7331d0d3bd42fa0cceec6a27cc14e1e88b /telephony/java | |
| parent | e32c345356469777a722325c07e34e90aecd8022 (diff) | |
| parent | d142df535d42b6927bcdb864d64fb5ef439da94e (diff) | |
| download | frameworks_base-433735f8719b418cb56133bf4862db68a96fbc70.zip frameworks_base-433735f8719b418cb56133bf4862db68a96fbc70.tar.gz frameworks_base-433735f8719b418cb56133bf4862db68a96fbc70.tar.bz2 | |
Merge "Prevent sign extension in IccUtils.parseToRGB"
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IccUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccUtils.java b/telephony/java/com/android/internal/telephony/IccUtils.java index 3e7094e..71936f1 100644 --- a/telephony/java/com/android/internal/telephony/IccUtils.java +++ b/telephony/java/com/android/internal/telephony/IccUtils.java @@ -397,7 +397,7 @@ public class IccUtils { int bits = data[valueIndex++] & 0xFF; int colorNumber = data[valueIndex++] & 0xFF; int clutOffset = ((data[valueIndex++] & 0xFF) << 8) - | data[valueIndex++]; + | (data[valueIndex++] & 0xFF); length = length - 6; int[] colorIndexArray = getCLUT(data, clutOffset, colorNumber); |