diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-01-07 14:00:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-07 14:00:28 +0000 |
| commit | e131981931e003aa2835ead6fdb84e70dbc8c655 (patch) | |
| tree | 090e7518ddc8b019fce369c335bf854f79e90e30 /core/java | |
| parent | 35f6fa7934b3755b26b35e2b94cba56a1b100665 (diff) | |
| parent | 3ea0f6f3ef31a0f8ca47dd4dfdd888ffd74b9bf8 (diff) | |
Merge "Log to SecurityLog if camera is disabled by admin"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/SecurityLog.java | 15 | ||||
| -rw-r--r-- | core/java/android/app/admin/SecurityLogTags.logtags | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index f0b87a8e2561..91cf120032b5 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -81,6 +81,7 @@ public class SecurityLog { TAG_CRYPTO_SELF_TEST_COMPLETED, TAG_KEY_INTEGRITY_VIOLATION, TAG_CERT_VALIDATION_FAILURE, + TAG_CAMERA_POLICY_SET }) public @interface SecurityLogTag {} @@ -433,6 +434,19 @@ public class SecurityLog { SecurityLogTags.SECURITY_CERT_VALIDATION_FAILURE; /** + * Indicates that the admin has set policy to disable camera. + * The log entry contains the following information about the event, encapsulated in an + * {@link Object} array and accessible via {@link SecurityEvent#getData()}: + * <li> [0] admin package name ({@code String}) + * <li> [1] admin user ID ({@code Integer}) + * <li> [2] target user ID ({@code Integer}) + * <li> [3] whether the camera is disabled or not ({@code Integer}, 1 if it's disabled, + * 0 if enabled) + */ + public static final int TAG_CAMERA_POLICY_SET = + SecurityLogTags.SECURITY_CAMERA_POLICY_SET; + + /** * Event severity level indicating that the event corresponds to normal workflow. */ public static final int LEVEL_INFO = 1; @@ -561,6 +575,7 @@ public class SecurityLog { case TAG_MAX_PASSWORD_ATTEMPTS_SET: case TAG_USER_RESTRICTION_ADDED: case TAG_USER_RESTRICTION_REMOVED: + case TAG_CAMERA_POLICY_SET: return LEVEL_INFO; case TAG_CERT_AUTHORITY_REMOVED: case TAG_CRYPTO_SELF_TEST_COMPLETED: diff --git a/core/java/android/app/admin/SecurityLogTags.logtags b/core/java/android/app/admin/SecurityLogTags.logtags index fe2519d2bdf1..4e67fe253715 100644 --- a/core/java/android/app/admin/SecurityLogTags.logtags +++ b/core/java/android/app/admin/SecurityLogTags.logtags @@ -38,3 +38,4 @@ option java_package android.app.admin 210031 security_crypto_self_test_completed (success|1) 210032 security_key_integrity_violation (key_id|3),(uid|1) 210033 security_cert_validation_failure (reason|3) +210034 security_camera_policy_set (package|3),(admin_user|1),(target_user|1),(disabled|1) |