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

Commit 604d9e61 authored by Hai Zhang's avatar Hai Zhang
Browse files

Use a local @PermissionResult int def for permission checker methods. 

Because the existing @PermissionCheckerManager.PermissionResult
references the non-API constants on @PermissionCheckerManager instead of
the API constants on PermissionManager.

Test: build
Change-Id: I2782f61058b6e2d8d38a9d7a08f02786aa174d96
parent e015b005

core/java/android/permission/PermissionManager.java

+16 −4
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.os.Build.VERSION_CODES.S; 
import android.Manifest;

import android.annotation.CheckResult;

import android.annotation.DurationMillisLong;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -75,6 +76,8 @@ import com.android.internal.R; 
import com.android.internal.annotations.Immutable;

import com.android.internal.util.CollectionUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;
@@ -111,6 +114,15 @@ public final class PermissionManager { 
     */

    public static final int PERMISSION_HARD_DENIED = 2;



    /** @hide */

    @IntDef(prefix = { "PERMISSION_" }, value = {

            PERMISSION_GRANTED,

            PERMISSION_SOFT_DENIED,

            PERMISSION_HARD_DENIED

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface PermissionResult {}



    /**

     * The set of flags that indicate that a permission state has been explicitly set

     *
@@ -262,7 +274,7 @@ public final class PermissionManager { 
     *

     * @see #checkPermissionForPreflight(String, AttributionSource)

     */

    @PermissionCheckerManager.PermissionResult

    @PermissionResult

    @RequiresPermission(value = Manifest.permission.UPDATE_APP_OPS_STATS, conditional = true)

    public int checkPermissionForDataDelivery(@NonNull String permission,

            @NonNull AttributionSource attributionSource, @Nullable String message) {
@@ -289,7 +301,7 @@ public final class PermissionManager { 
     *

     * @see #checkPermissionForDataDelivery(String, AttributionSource, String)

     */

    @PermissionCheckerManager.PermissionResult

    @PermissionResult

    @RequiresPermission(value = Manifest.permission.UPDATE_APP_OPS_STATS, conditional = true)

    public int checkPermissionForStartDataDelivery(@NonNull String permission,

            @NonNull AttributionSource attributionSource, @Nullable String message) {
@@ -342,7 +354,7 @@ public final class PermissionManager { 
     *

     * @see #checkPermissionForPreflight(String, AttributionSource)

     */

    @PermissionCheckerManager.PermissionResult

    @PermissionResult

    @RequiresPermission(value = Manifest.permission.UPDATE_APP_OPS_STATS, conditional = true)

    public int checkPermissionForDataDeliveryFromDataSource(@NonNull String permission,

            @NonNull AttributionSource attributionSource, @Nullable String message) {
@@ -373,7 +385,7 @@ public final class PermissionManager { 
     * @return The permission check result which is either {@link #PERMISSION_GRANTED}

     *     or {@link #PERMISSION_SOFT_DENIED} or {@link #PERMISSION_HARD_DENIED}.

     */

    @PermissionCheckerManager.PermissionResult

    @PermissionResult

    public int checkPermissionForPreflight(@NonNull String permission,

            @NonNull AttributionSource attributionSource) {

        return PermissionChecker.checkPermissionForPreflight(mContext, permission,