am 572e0087: Merge change Idfc116fe into eclair

Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2

* commit '572e0087a86c6781e3334f8a6f901039a407138d':
  Return null if SIM doesn't have the MSISDN Aplha tag.
This commit is contained in:
Jaikumar Ganesh
2009-11-12 23:06:29 -08:00
committed by Android Git Automerger

View File

@@ -879,16 +879,7 @@ public class GSMPhone extends PhoneBase {
} }
public String getLine1AlphaTag() { public String getLine1AlphaTag() {
String ret; return mSIMRecords.getMsisdnAlphaTag();
ret = mSIMRecords.getMsisdnAlphaTag();
if (ret == null || ret.length() == 0) {
return mContext.getText(
com.android.internal.R.string.defaultMsisdnAlphaTag).toString();
}
return ret;
} }
public void setLine1Number(String alphaTag, String number, Message onComplete) { public void setLine1Number(String alphaTag, String number, Message onComplete) {