diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 16:10:10 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 16:10:10 -0800 |
commit | 572e0087a86c6781e3334f8a6f901039a407138d (patch) | |
tree | f4ced4cdc55d5fa8ad251428576be05aa9915c29 /telephony | |
parent | 274072089ceff6eacb9ccfb59290a18f43739c87 (diff) | |
parent | de1fcd49e786735555f0c289dd5d6044617b7337 (diff) | |
download | frameworks_base-572e0087a86c6781e3334f8a6f901039a407138d.zip frameworks_base-572e0087a86c6781e3334f8a6f901039a407138d.tar.gz frameworks_base-572e0087a86c6781e3334f8a6f901039a407138d.tar.bz2 |
Merge change Idfc116fe into eclair
* changes:
Return null if SIM doesn't have the MSISDN Aplha tag.
Diffstat (limited to 'telephony')
-rwxr-xr-x | telephony/java/com/android/internal/telephony/gsm/GSMPhone.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index 5614c12..a5188ce 100755 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -879,16 +879,7 @@ public class GSMPhone extends PhoneBase { } public String getLine1AlphaTag() { - String ret; - - ret = mSIMRecords.getMsisdnAlphaTag(); - - if (ret == null || ret.length() == 0) { - return mContext.getText( - com.android.internal.R.string.defaultMsisdnAlphaTag).toString(); - } - - return ret; + return mSIMRecords.getMsisdnAlphaTag(); } public void setLine1Number(String alphaTag, String number, Message onComplete) { |