commit b031063587512b48a06ccab06934cecf6e0faec3
author Brandon Maxwell <maxwelb@google.com> Fri Nov 06 18:44:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 06 18:44:23 2015 +0000
tree 86c629a6056d00a13df228e37c07a066d1f9bcc0
parent b521d90ac327a24c332d2006666cab530029cf0d
parent 9c09db6afdf47a7e5564ea945e80728f442661be

Merge "Blocking number takes user back to blocked numbers list" into ub-contactsdialer-a-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1bb1296..618676c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.dialer"
     coreApp="true"
-    android:versionCode="20305"
-    android:versionName="2.3.05">
+    android:versionCode="20306"
+    android:versionName="2.3.06">
 
     <uses-sdk
         android:minSdkVersion="23"

src/com/android/dialer/calllog/DefaultVoicemailNotifier.java

diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index 635e874..ff91372 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -31,6 +31,7 @@
 import android.net.Uri;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.PhoneLookup;
+import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -153,7 +154,7 @@
                     // Look it up in the database.
                     name = mNameLookupQuery.query(newCall.number);
                     if (TextUtils.isEmpty(name)) {
-                        name = newCall.number;
+                        name = PhoneNumberUtils.formatNumber(newCall.number, newCall.countryIso);
                     }
                 }
                 names.put(newCall.number, name);