commit bd20e52e37c0d4103fc4d5840d4b2ab77b04c41a
author The Android Automerger <android-build@google.com> Tue Sep 24 06:01:40 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 24 06:01:40 2013 -0700
tree 45634f49b6c3c92a5a5e02731023ffdd87231309
parent 4f46a6e32c6b32a83875fb05fffa2fbb0d4044d0
parent 1ee2e708c4aeb78e8846728ec277b3006c461f41

merge in klp-release history after reset to klp-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 958dbfb..2f04833 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -625,6 +625,6 @@
     <string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string>
 
     <!-- Shows when there are no favorites. -->
-    <string name="no_favorites">Favorites &amp; contacts you call often will show here. So, start calling.</string>
+    <string name="no_favorites">Favorites &amp; contacts you\ncall often will show here.\nSo, start calling.</string>
 
 </resources>

src/com/android/dialer/CallDetailActivity.java

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 7a08708..79a9956 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -632,7 +632,7 @@
             // If this is not a regular number, there is no point in looking it up in the contacts.
             ContactInfo info =
                     PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)
-                    && new PhoneNumberUtilsWrapper().isVoicemailNumber(number)
+                    && !new PhoneNumberUtilsWrapper().isVoicemailNumber(number)
                             ? mContactInfoHelper.lookupNumber(number, countryIso)
                             : null;
             if (info == null) {