commit 0e723d937f3fc9a0bda2602d97d9fbeda7300d51
author Walter Jang <wjang@google.com> Thu Jul 07 19:00:30 2016 -0700
committer Walter Jang <wjang@google.com> Fri Jul 08 10:17:55 2016 -0700
tree 8fde205bdce9b3c4519189606a01b3f3a9f543bc
parent 3a2fe3b2cab150db0dde8d3cd86e2e942a500438

Added optional uses-feature telephony to enable tablet installs (1/3)

Also, just use the Manifest.permission constants directly in
QuickContactActivity instead of referencing them through
the Activity that asks the user for dessired permissions.

Bug 30000144

Change-Id: I56da60bf54cdf5118500e9717b0980425f02c467

AndroidManifest.xml

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"

src/com/android/contacts/quickcontact/QuickContactActivity.java

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;