commit 4b5b8081c8b46412133e6b971f1d830ab3e9ee38
author Walter Jang <wjang@google.com> Mon Feb 22 21:23:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 22 21:23:57 2016 +0000
tree 464339860af3163df1a9663fc623e075613cc5b9
parent d257289455273fa8390cb9d1e4a03fd1a47e2f02
parent d6bcb6f8724ba88ee99f6088098b0ce6455d1f93

Merge "Revert "Ask for optional permissions when QuickContact opens"" into nyc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a2eb1a3..f415d88 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -233,12 +233,6 @@
             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 5e00bfe..8ebbb25 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -108,7 +108,6 @@
 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;
@@ -910,8 +909,7 @@
         Trace.beginSection("onCreate()");
         super.onCreate(savedInstanceState);
 
-        if (RequestPermissionsActivity.startPermissionActivity(this) ||
-                RequestDesiredPermissionsActivity.startPermissionActivity(this)) {
+        if (RequestPermissionsActivity.startPermissionActivity(this)) {
             return;
         }