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

Merge "Update fields for SecurityLog WiFi events." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-21 17:45:57 +00:00
committed by Android (Google) Code Review
parent f0a312d294 d57f26b644
commit 43d732feb3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/app/admin/SecurityLog.java
View File

@@ -517,14 +517,15 @@ public class SecurityLog {
public static final int TAG_PASSWORD_CHANGED = SecurityLogTags.SECURITY_PASSWORD_CHANGED;
/**
* Indicates that the device attempts to connect to a WiFi network.
* The log entry contains the following information about the
* Indicates that an event occurred as the device attempted to connect to
* a WiFi network. The log entry contains the following information about the
* event, encapsulated in an {@link Object} array and accessible via
* {@link SecurityEvent#getData()}:
* <li> [0] The SSID of the network ({@code String})
* <li> [1] The BSSID of the network ({@code String})
* <li> [2] Whether the connection is successful ({@code Integer}, 1 if successful, 0 otherwise)
* <li> [3] Optional human-readable failure reason, empty string if none ({@code String})
* <li> [0] Last 2 octets of the network BSSID ({@code String}, in the form "xx:xx:xx:xx:AA:BB")
* <li> [1] Type of event that occurred ({@code String}). Event types are CONNECTED,
* DISCONNECTED, ASSOCIATING, ASSOCIATED, EAP_METHOD_SELECTED, EAP_FAILURE,
* SSID_TEMP_DISABLED, and OPEN_SSL_FAILURE.
* <li> [2] Optional human-readable failure reason, empty string if none ({@code String})
*/
public static final int TAG_WIFI_CONNECTION = SecurityLogTags.SECURITY_WIFI_CONNECTION;
@@ -533,9 +534,8 @@ public class SecurityLog {
* The log entry contains the following information about the
* event, encapsulated in an {@link Object} array and accessible via
* {@link SecurityEvent#getData()}:
* <li> [0] The SSID of the connected network ({@code String})
* <li> [1] The BSSID of the connected network ({@code String})
* <li> [2] Optional human-readable disconnection reason, empty string if none ({@code String})
* <li> [0] Last 2 octets of the network BSSID ({@code String}, in the form "xx:xx:xx:xx:AA:BB")
* <li> [1] Optional human-readable disconnection reason, empty string if none ({@code String})
*/
public static final int TAG_WIFI_DISCONNECTION = SecurityLogTags.SECURITY_WIFI_DISCONNECTION;

4
core/java/android/app/admin/SecurityLogTags.logtags
View File

@@ -41,7 +41,7 @@ option java_package android.app.admin
210034 security_camera_policy_set (package|3),(admin_user|1),(target_user|1),(disabled|1)
210035 security_password_complexity_required (package|3),(admin_user|1),(target_user|1),(complexity|1)
210036 security_password_changed (password_complexity|1),(target_user|1)
210037 security_wifi_connection (ssid|3),(bssid|3),(success|1),(reason|3)
210038 security_wifi_disconnection (ssid|3),(bssid|3),(reason|3)
210037 security_wifi_connection (bssid|3),(event_type|3),(reason|3)
210038 security_wifi_disconnection (bssid|3),(reason|3)
210039 security_bluetooth_connection (addr|3),(success|1),(reason|3)
210040 security_bluetooth_disconnection (addr|3),(reason|3)