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

Commit 8acc50c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change documentation of PERMISSION_SOFT_DENIED" into main

parents c66333f1 3f98a62f

core/java/android/content/PermissionChecker.java

+1 −2
Original line number Diff line number Diff line
@@ -73,13 +73,12 @@ public final class PermissionChecker { 
    public static final int PERMISSION_GRANTED = PermissionCheckerManager.PERMISSION_GRANTED;



    /**

     * The permission is denied. Applicable only to runtime and app op permissions.

     * The permission is denied. Applicable only to runtime permissions.

     *

     * <p>Returned when:

     * <ul>

     *   <li>the runtime permission is granted, but the corresponding app op is denied

     *       for runtime permissions.</li>

     *   <li>the app ops is ignored for app op permissions.</li>

     * </ul>

     *

     * @hide

core/java/android/permission/PermissionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public final class PermissionManager { 
    public static final int PERMISSION_GRANTED = 0;



    /**

     * The permission is denied. Applicable only to runtime and app op permissions.

     * The permission is denied. Applicable only to runtime permissions.

     * <p>

     * The app isn't expecting the permission to be denied so that a "no-op" action should be taken,

     * such as returning an empty result.