commit 5e481e746f72e242ceb13d509d4c87145a8291e4
author Tingting Wang <tingtingw@google.com> Tue Mar 08 00:07:00 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 00:07:01 2016 +0000
tree 0e69ac238c44bb96905b4fdd168020f061f67e75
parent c030f43136b9d520d1e5e0c881a6a29711911697
parent 946b2ffd43b5265fcf99fd4101c1daab31d802a9

Merge "Remove unused resources and strings from Contacts." into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e75fe6b..a9551ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10404"
-    android:versionName="1.4.4">
+    android:versionCode="10405"
+    android:versionName="1.4.5">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23" />
     <original-package android:name="com.android.contacts" />

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 76da135..d1d6e7c 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1213,8 +1213,11 @@
                 return true;
             }
             case R.id.menu_blocked_numbers: {
-                TelecomManagerUtil.launchBlockedNumbersActivity(
+                final Intent intent = TelecomManagerUtil.createManageBlockedNumbersIntent(
                         (TelecomManager) getSystemService(Context.TELECOM_SERVICE));
+                if (intent != null) {
+                    startActivity(intent);
+                }
                 return true;
             }
             case R.id.export_database: {