commit f62363701d76b1283edeb7305fc19249fc34899c
author Walter Jang <wjang@google.com> Mon Feb 22 21:24:22 2016 +0000
committer Walter Jang <wjang@google.com> Mon Feb 22 21:25:01 2016 +0000
tree 0bd48c61501de0419e156ed5a483a8f17cbef70e
parent 4b5b8081c8b46412133e6b971f1d830ab3e9ee38

Revert "Revert "Ask for optional permissions when QuickContact opens""

This reverts commit d6bcb6f8724ba88ee99f6088098b0ce6455d1f93.

Change-Id: I1502a50e087999971ae26ca37beee2e1358bcc45

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f415d88..a2eb1a3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -233,6 +233,12 @@
             android:exported="false"/>
 
         <activity
+            android:name=".common.activity.RequestDesiredPermissionsActivity"
+            android:label="@string/launcherActivityLabel"
+            android:theme="@style/PeopleTheme"
+            android:exported="false"/>
+
+        <activity
             android:name=".common.activity.RequestImportVCardPermissionsActivity"
             android:label="@string/launcherActivityLabel"
             android:theme="@style/PeopleTheme"

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 8ebbb25..5e00bfe 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -108,6 +108,7 @@
 import com.android.contacts.common.Collapser;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactsUtils;
+import com.android.contacts.common.activity.RequestDesiredPermissionsActivity;
 import com.android.contacts.common.activity.RequestPermissionsActivity;
 import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.compat.EventCompat;
@@ -909,7 +910,8 @@
         Trace.beginSection("onCreate()");
         super.onCreate(savedInstanceState);
 
-        if (RequestPermissionsActivity.startPermissionActivity(this)) {
+        if (RequestPermissionsActivity.startPermissionActivity(this) ||
+                RequestDesiredPermissionsActivity.startPermissionActivity(this)) {
             return;
         }