summaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-08-31 09:16:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-31 09:16:31 -0700
commit7f7d82aac56022880f613772ed4a90738075c843 (patch)
tree31d75f1bedfdadb38e5625fa1911f590e7334f2b /src/java
parentcbbf6deee30d702e398939f4bb464f5e821f5e6c (diff)
parent50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5 (diff)
downloadframeworks_opt_telephony-7f7d82aac56022880f613772ed4a90738075c843.zip
frameworks_opt_telephony-7f7d82aac56022880f613772ed4a90738075c843.tar.gz
frameworks_opt_telephony-7f7d82aac56022880f613772ed4a90738075c843.tar.bz2
am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"
* commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5': WspTypeDecoder: fixed decoding of content parameters
Diffstat (limited to 'src/java')
-rwxr-xr-xsrc/java/com/android/internal/telephony/WspTypeDecoder.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/java/com/android/internal/telephony/WspTypeDecoder.java b/src/java/com/android/internal/telephony/WspTypeDecoder.java
index 73260fb..a19546a 100755
--- a/src/java/com/android/internal/telephony/WspTypeDecoder.java
+++ b/src/java/com/android/internal/telephony/WspTypeDecoder.java
@@ -506,11 +506,7 @@ public class WspTypeDecoder {
} else if (decodeIntegerValue(startIndex + totalRead)) {
totalRead += dataLength;
int intValue = (int) unsigned32bit;
- if (intValue == 0) {
- value = "";
- } else {
- value = String.valueOf(intValue);
- }
+ value = String.valueOf(intValue);
} else {
decodeTokenText(startIndex + totalRead);
totalRead += dataLength;