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

Commit f6236370 authored by Walter Jang's avatar Walter Jang
Browse files

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

This reverts commit d6bcb6f8.

Change-Id: I1502a50e087999971ae26ca37beee2e1358bcc45
parent 4b5b8081

AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -232,6 +232,12 @@ 
            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

+3 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 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;
@@ -909,7 +910,8 @@ public class QuickContactActivity extends ContactsActivity 
        Trace.beginSection("onCreate()");

        super.onCreate(savedInstanceState);



        if (RequestPermissionsActivity.startPermissionActivity(this)) {

        if (RequestPermissionsActivity.startPermissionActivity(this) ||

                RequestDesiredPermissionsActivity.startPermissionActivity(this)) {

            return;

        }