Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update javadoc for security log APIs" into udc-dev

Browse Source
This commit is contained in:
Rubin Xu
2023-04-05 15:56:43 +00:00
committed by Android (Google) Code Review
parent 2b1526b1a8 6eb830a861
commit b068a641b9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -13646,8 +13646,8 @@ public class DevicePolicyManager {
* privacy-sensitive events happening outside the managed profile would have been redacted * privacy-sensitive events happening outside the managed profile would have been redacted
* already. * already.
* *
* @param admin Which device admin this request is associated with. Null if the caller is not * @param admin Which device admin this request is associated with, or {@code null}
* a device admin * if called by a delegated app.
* @param enabled whether security logging should be enabled or not. * @param enabled whether security logging should be enabled or not.
* @throws SecurityException if the caller is not permitted to control security logging. * @throws SecurityException if the caller is not permitted to control security logging.
* @see #setAffiliationIds * @see #setAffiliationIds
@@ -13699,8 +13699,8 @@ public class DevicePolicyManager {
* it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown. * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown.
* See {@link #isAffiliatedUser}. * See {@link #isAffiliatedUser}.
* *
* @param admin Which device admin this request is associated with. Null if the caller is not * @param admin Which device admin this request is associated with, or {@code null}
* a device admin. * if called by a delegated app.
* @return the new batch of security logs which is a list of {@link SecurityEvent}, * @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. * 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, * @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. * it must be affiliated with the device. Otherwise a {@link SecurityException} will be thrown.
* See {@link #isAffiliatedUser}. * See {@link #isAffiliatedUser}.
* *
* @param admin Which device admin this request is associated with. Null if the caller is not * @param admin Which device admin this request is associated with, or {@code null}
* a device admin. * if called by a delegated app.
* @return Device logs from before the latest reboot of the system, or {@code null} if this API * @return Device logs from before the latest reboot of the system, or {@code null} if this API
* is not supported on the device. * is not supported on the device.
* @throws SecurityException if the caller is not allowed to access security logging, or * @throws SecurityException if the caller is not allowed to access security logging, or