Revert "Revert "Ask for optional permissions when QuickContact opens""
This reverts commit d6bcb6f8724ba88ee99f6088098b0ce6455d1f93.
Change-Id: I1502a50e087999971ae26ca37beee2e1358bcc45
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;
}