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

Commit 0c14d011 authored by Nancy Chen's avatar Nancy Chen Committed by Android (Google) Code Review
Browse files

Merge "Handle backwards compatible permission lookup and requests (2/3)." into... 

Merge "Handle backwards compatible permission lookup and requests (2/3)." into ub-contactsdialer-b-dev
parents 34d81ed8 054bd1e4

src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java

+12 −3
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.os.Bundle;

import android.os.Trace;

import android.support.v4.app.ActivityCompat;

import android.support.v4.content.ContextCompat;

import android.widget.Toast;



import java.util.ArrayList;
@@ -37,7 +39,8 @@ import java.util.Arrays; 
 * NOTE: As a result of b/22095159, this can behave oddly in the case where the final permission

 * you are requesting causes an application restart.

 */

public abstract class RequestPermissionsActivityBase extends Activity {

public abstract class RequestPermissionsActivityBase extends Activity

        implements ActivityCompat.OnRequestPermissionsResultCallback {

    public static final String PREVIOUS_ACTIVITY_INTENT = "previous_intent";

    private static final int PERMISSIONS_REQUEST_ALL_PERMISSIONS = 1;
@@ -137,7 +140,8 @@ public abstract class RequestPermissionsActivityBase extends Activity { 
                throw new RuntimeException("Request permission activity was called even"

                        + " though all permissions are satisfied.");

            }

            requestPermissions(

            ActivityCompat.requestPermissions(

                    this,

                    unsatisfiedPermissions.toArray(new String[unsatisfiedPermissions.size()]),

                    PERMISSIONS_REQUEST_ALL_PERMISSIONS);

        } finally {
@@ -145,11 +149,16 @@ public abstract class RequestPermissionsActivityBase extends Activity { 
        }

    }



    @Override

    public int checkSelfPermission(String permission) {

        return ContextCompat.checkSelfPermission(this, permission);

    }



    protected static boolean hasPermissions(Context context, String[] permissions) {

        Trace.beginSection("hasPermission");

        try {

            for (String permission : permissions) {

                if (context.checkSelfPermission(permission)

                if (ContextCompat.checkSelfPermission(context, permission)

                        != PackageManager.PERMISSION_GRANTED) {

                    return false;

                }

src/com/android/contacts/common/util/PermissionsUtil.java

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.os.Process;

import android.support.v4.content.ContextCompat;

import android.support.v4.content.LocalBroadcastManager;



/**
@@ -52,7 +53,8 @@ public class PermissionsUtil { 
    }



    public static boolean hasPermission(Context context, String permission) {

        return context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED;

        return ContextCompat.checkSelfPermission(context, permission)

                == PackageManager.PERMISSION_GRANTED;

    }



    public static boolean hasAppOp(Context context, String appOp) {