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

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

Merge "Update javadoc for security log APIs" into udc-dev am: b068a641 am: 95afde08 

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



Change-Id: I467dc27df2a87bbe329c346785f7dc826fa86f8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc604665 95afde08

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

+6 −6
Original line number Diff line number Diff line
@@ -13646,8 +13646,8 @@ public class DevicePolicyManager { 
     * privacy-sensitive events happening outside the managed profile would have been redacted

     * already.

     *

     * @param admin Which device admin this request is associated with. Null if the caller is not

     *              a device admin

     * @param admin Which device admin this request is associated with, or {@code null}

     *              if called by a delegated app.

     * @param enabled whether security logging should be enabled or not.

     * @throws SecurityException if the caller is not permitted to control security logging.

     * @see #setAffiliationIds
@@ -13699,8 +13699,8 @@ public class DevicePolicyManager { 
     * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown.

     * See {@link #isAffiliatedUser}.

     *

     * @param admin Which device admin this request is associated with. Null if the caller is not

     *              a device admin.

     * @param admin Which device admin this request is associated with, or {@code null}

     *              if called by a delegated app.

     * @return the new batch of security logs which is a list of {@link SecurityEvent},

     * or {@code null} if rate limitation is exceeded or if logging is currently disabled.

     * @throws SecurityException if the caller is not allowed to access security logging,
@@ -13857,8 +13857,8 @@ public class DevicePolicyManager { 
     * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown.

     * See {@link #isAffiliatedUser}.

     *

     * @param admin Which device admin this request is associated with. Null if the caller is not

     *              a device admin.

     * @param admin Which device admin this request is associated with, or {@code null}

     *             if called by a delegated app.

     * @return Device logs from before the latest reboot of the system, or {@code null} if this API

     *         is not supported on the device.

     * @throws SecurityException if the caller is not allowed to access security logging, or