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 am: b068a641b9

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

Change-Id: If6ed03d04033a6b4abf9a38ce6fdbdd455201709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rubin Xu
2023-04-05 17:27:06 +00:00
committed by Automerger Merge Worker
parent 7ed3a6aa6a b068a641b9
commit d32f9b0164
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
* 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