commit 170614a9c237862a3f2548ebd0816965bf875e88
author Wink Saville <wink@google.com> Mon Aug 02 12:02:35 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 02 12:02:35 2010 -0700
tree e6d4d9e8756cf5a5de371919ee6e455477ba0022
parent 30802a7e5dc77512191bcdde44640565212b4243
parent 4ad335f8c80c1d588426ef796afdd1a682eecd29

am 4ad335f8: Compare only network portion to determine if number is voicemail.

Merge commit '4ad335f8c80c1d588426ef796afdd1a682eecd29' into gingerbread

* commit '4ad335f8c80c1d588426ef796afdd1a682eecd29':
  Compare only network portion to determine if number is voicemail.

src/com/android/contacts/RecentCallsListActivity.java

diff --git a/src/com/android/contacts/RecentCallsListActivity.java b/src/com/android/contacts/RecentCallsListActivity.java
index e3213a3..b84fcd4 100644
--- a/src/com/android/contacts/RecentCallsListActivity.java
+++ b/src/com/android/contacts/RecentCallsListActivity.java
@@ -609,7 +609,8 @@
                     views.callView.setVisibility(View.INVISIBLE);
                 } else if (number.equals(CallerInfo.PAYPHONE_NUMBER)) {
                     number = getString(R.string.payphone);
-                } else if (number.equals(mVoiceMailNumber)) {
+                } else if (PhoneNumberUtils.extractNetworkPortion(number)
+                                .equals(mVoiceMailNumber)) {
                     number = getString(R.string.voicemail);
                 } else {
                     // Just a raw number, and no cache, so format it nicely
@@ -859,7 +860,7 @@
             number = getString(R.string.private_num);
         } else if (number.equals(CallerInfo.PAYPHONE_NUMBER)) {
             number = getString(R.string.payphone);
-        } else if (number.equals(mVoiceMailNumber)) {
+        } else if (PhoneNumberUtils.extractNetworkPortion(number).equals(mVoiceMailNumber)) {
             number = getString(R.string.voicemail);
             numberUri = Uri.parse("voicemail:x");
             isVoicemail = true;