summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-29 15:11:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-29 15:11:41 -0700
commit280a0c17d75ec6563d45233c25997bc3df542c35 (patch)
tree1c91000c6f2db8aac18a9d5c1d0ca763bbc7ad9e
parentfe96a021cfa60aa4196df25f754cac5159ad3940 (diff)
parent889bb20f1bb47437331d404a59b86e6dfa4e2e93 (diff)
downloadframeworks_base-280a0c17d75ec6563d45233c25997bc3df542c35.zip
frameworks_base-280a0c17d75ec6563d45233c25997bc3df542c35.tar.gz
frameworks_base-280a0c17d75ec6563d45233c25997bc3df542c35.tar.bz2
am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."
* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93': Removing unnecessary computation.
-rw-r--r--telephony/java/com/android/internal/telephony/IccUtils.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccUtils.java b/telephony/java/com/android/internal/telephony/IccUtils.java
index df579b0..c3b0ffc 100644
--- a/telephony/java/com/android/internal/telephony/IccUtils.java
+++ b/telephony/java/com/android/internal/telephony/IccUtils.java
@@ -416,7 +416,6 @@ public class IccUtils {
int colorNumber = data[valueIndex++] & 0xFF;
int clutOffset = ((data[valueIndex++] & 0xFF) << 8)
| (data[valueIndex++] & 0xFF);
- length = length - 6;
int[] colorIndexArray = getCLUT(data, clutOffset, colorNumber);
if (true == transparency) {