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

Commit 21f9e305 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "devicepolicy: fix javadoc typo" into tm-dev am: 5f50853c am: 5b2ec199 

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



Change-Id: Ifb4c27cbee73652658830f754db80570b85ff816
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13f3e4ed 5b2ec199

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

+1 −1
Original line number Diff line number Diff line
@@ -2542,7 +2542,7 @@ public class DevicePolicyManager { 
     * that has this delegation. If another app already had delegated security logging access, it

     * will lose the delegation when a new app is delegated.

     *

     * <p> Can only be granted by Device Owner or Profile Owner of an organnization owned and

     * <p> Can only be granted by Device Owner or Profile Owner of an organization-owned

     * managed profile.

     */

    public static final String DELEGATION_SECURITY_LOGGING = "delegation-security-logging";