diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 72004a4..5525236 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -50,6 +50,8 @@
     <!-- Following used for Contact metadata syncing -->
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 
+    <uses-feature android:name="android.hardware.telephony" required="false"/>
+
     <application
         android:name="com.android.contacts.ContactsApplication"
         android:label="@string/applicationLabel"
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 64db298..5ec7818 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.contacts.quickcontact;
 
+import android.Manifest;
 import android.accounts.Account;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
@@ -957,16 +958,16 @@
         // 3. App has permission.
         // Permission explanation card is displayed only for case 1.
         final boolean hasCalendarPermission = PermissionsUtil.hasPermission(
-                this, RequestDesiredPermissionsActivity.DESIRED_PERMISSIONS[0]);
+                this, Manifest.permission.READ_CALENDAR);
         final boolean hasSMSPermission = PermissionsUtil.hasPermission(
-                this, RequestDesiredPermissionsActivity.DESIRED_PERMISSIONS[1]);
+                this, Manifest.permission.READ_SMS);
 
         final boolean wasCalendarPermissionDenied =
                 ActivityCompat.shouldShowRequestPermissionRationale(
-                        this, RequestDesiredPermissionsActivity.DESIRED_PERMISSIONS[0]);
+                        this, Manifest.permission.READ_CALENDAR);
         final boolean wasSMSPermissionDenied =
                 ActivityCompat.shouldShowRequestPermissionRationale(
-                        this, RequestDesiredPermissionsActivity.DESIRED_PERMISSIONS[1]);
+                        this, Manifest.permission.READ_SMS);
 
         final boolean shouldDisplayCalendarMessage =
                 !hasCalendarPermission && !wasCalendarPermissionDenied;
