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

Commit 3100ee7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Documentation fix: Permission grant opt-out" into sc-dev am: e8eaea0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13807003

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18620698406a95982a6c102a4b3528c19b90e7c3
parents 82af1500 e8eaea0e

core/java/android/app/admin/DevicePolicyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -987,7 +987,8 @@ public class DevicePolicyManager { 
     * The default for this extra is {@code false} - by default, the admin of a fully-managed

     * device has the ability to grant sensors-related permissions.

     *

     * <p>Use with {@link #ACTION_PROVISION_MANAGED_DEVICE} only.

     * <p>Use only for device owner provisioning.

     * @see #ACTION_GET_PROVISIONING_MODE

     */

    public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT =

            "android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT";