Merge "Prevent sign extension in IccUtils.parseToRGB"

2010-02-17 12:02:35 -08:00
parent e32c345356 d142df535d
commit 433735f871
1 changed files with 1 additions and 1 deletions
--- 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);