Merge "Prevent sign extension in UsimPhoneBookManager"

2010-02-17 10:26:40 -08:00
parent 855dd9e074 a409128a72
commit 9cd6bfefd7
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
+++ b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
@@ -409,7 +409,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
                    case USIM_EFIAP_TAG:
                    case USIM_EFSNE_TAG:
                        data = tlv.getData();
-                        int efid = data[0] << 8 | data[1];
+                        int efid = ((data[0] & 0xFF) << 8) | (data[1] & 0xFF);
                        val.put(tag, efid);
                        break;
                }