Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b5b8081 authored by Walter Jang's avatar Walter Jang Committed by Android (Google) Code Review
Browse files

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

parents d2572894 d6bcb6f8

AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -232,12 +232,6 @@ 
            android:theme="@style/PeopleTheme"

            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"

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

+1 −3
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ import com.android.contacts.common.ClipboardUtils; 
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 @@ public class QuickContactActivity extends ContactsActivity 
        Trace.beginSection("onCreate()");

        super.onCreate(savedInstanceState);



        if (RequestPermissionsActivity.startPermissionActivity(this) ||

                RequestDesiredPermissionsActivity.startPermissionActivity(this)) {

        if (RequestPermissionsActivity.startPermissionActivity(this)) {

            return;

        }