Skip to content

Commit 8f9f144

Browse files
pfmaggijscott1989
pfmaggi
authored and
jscott1989
committed
Move getStringEventTagFromId back into SecurityLogsFragment
1 parent d5bc8d7 commit 8f9f144

File tree

3 files changed

+111
-111
lines changed

3 files changed

+111
-111
lines changed

‎src/main/java/com/afwsamples/testdpc/ShellCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ private void printSecurityLogs(List<SecurityEvent> events) {
14711471
if (Util.SDK_INT >= VERSION_CODES.P) {
14721472
sb.append(event.getId() + ": ");
14731473
}
1474-
sb.append(Util.getStringEventTagFromId(event.getTag()));
1474+
sb.append(SecurityLogsFragment.getStringEventTagFromId(event.getTag()));
14751475
sb.append(" (")
14761476
.append(formatter.format(new Date(TimeUnit.NANOSECONDS.toMillis(event.getTimeNanos()))))
14771477
.append("): ");

‎src/main/java/com/afwsamples/testdpc/common/Util.java

Lines changed: 0 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.app.Service;
2121
import android.app.UiModeManager;
2222
import android.app.admin.DevicePolicyManager;
23-
import android.app.admin.SecurityLog;
2423
import android.content.ActivityNotFoundException;
2524
import android.content.ComponentName;
2625
import android.content.Context;
@@ -355,112 +354,4 @@ public static String constantToString(Class<?> clazz, String prefix, int value)
355354
private static String constNameWithoutPrefix(String prefix, Field field) {
356355
return field.getName().substring(prefix.length());
357356
}
358-
359-
public static String getStringEventTagFromId(int eventId) {
360-
final String eventTag;
361-
switch (eventId) {
362-
case SecurityLog.TAG_ADB_SHELL_INTERACTIVE:
363-
eventTag = "ADB_SHELL_INTERACTIVE";
364-
break;
365-
case SecurityLog.TAG_ADB_SHELL_CMD:
366-
eventTag = "ADB_SHELL_CMD";
367-
break;
368-
case SecurityLog.TAG_SYNC_RECV_FILE:
369-
eventTag = "SYNC_RECV_FILE";
370-
break;
371-
case SecurityLog.TAG_SYNC_SEND_FILE:
372-
eventTag = "SYNC_SEND_FILE";
373-
break;
374-
case SecurityLog.TAG_APP_PROCESS_START:
375-
eventTag = "APP_PROCESS_START";
376-
break;
377-
case SecurityLog.TAG_KEYGUARD_DISMISSED:
378-
eventTag = "KEYGUARD_DISMISSED";
379-
break;
380-
case SecurityLog.TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT:
381-
eventTag = "KEYGUARD_DISMISS_AUTH_ATTEMPT";
382-
break;
383-
case SecurityLog.TAG_KEYGUARD_SECURED:
384-
eventTag = "KEYGUARD_SECURED";
385-
break;
386-
case SecurityLog.TAG_OS_STARTUP:
387-
eventTag = "OS_STARTUP";
388-
break;
389-
case SecurityLog.TAG_OS_SHUTDOWN:
390-
eventTag = "OS_SHUTDOWN";
391-
break;
392-
case SecurityLog.TAG_LOGGING_STARTED:
393-
eventTag = "LOGGING_STARTED";
394-
break;
395-
case SecurityLog.TAG_LOGGING_STOPPED:
396-
eventTag = "LOGGING_STOPPED";
397-
break;
398-
case SecurityLog.TAG_MEDIA_MOUNT:
399-
eventTag = "MEDIA_MOUNT";
400-
break;
401-
case SecurityLog.TAG_MEDIA_UNMOUNT:
402-
eventTag = "MEDIA_UNMOUNT";
403-
break;
404-
case SecurityLog.TAG_LOG_BUFFER_SIZE_CRITICAL:
405-
eventTag = "LOG_BUFFER_SIZE_CRITICAL";
406-
break;
407-
case SecurityLog.TAG_PASSWORD_EXPIRATION_SET:
408-
eventTag = "PASSWORD_EXPIRATION_SET";
409-
break;
410-
case SecurityLog.TAG_PASSWORD_COMPLEXITY_SET:
411-
eventTag = "PASSWORD_COMPLEXITY_SET";
412-
break;
413-
case SecurityLog.TAG_PASSWORD_HISTORY_LENGTH_SET:
414-
eventTag = "PASSWORD_HISTORY_LENGTH_SET";
415-
break;
416-
case SecurityLog.TAG_MAX_SCREEN_LOCK_TIMEOUT_SET:
417-
eventTag = "MAX_SCREEN_LOCK_TIMEOUT_SET";
418-
break;
419-
case SecurityLog.TAG_MAX_PASSWORD_ATTEMPTS_SET:
420-
eventTag = "MAX_PASSWORD_ATTEMPTS_SET";
421-
break;
422-
case SecurityLog.TAG_KEYGUARD_DISABLED_FEATURES_SET:
423-
eventTag = "KEYGUARD_DISABLED_FEATURES_SET";
424-
break;
425-
case SecurityLog.TAG_REMOTE_LOCK:
426-
eventTag = "REMOTE_LOCK";
427-
break;
428-
case SecurityLog.TAG_WIPE_FAILURE:
429-
eventTag = "WIPE_FAILURE";
430-
break;
431-
case SecurityLog.TAG_KEY_GENERATED:
432-
eventTag = "KEY_GENERATED";
433-
break;
434-
case SecurityLog.TAG_KEY_IMPORT:
435-
eventTag = "KEY_IMPORT";
436-
break;
437-
case SecurityLog.TAG_KEY_DESTRUCTION:
438-
eventTag = "KEY_DESTRUCTION";
439-
break;
440-
case SecurityLog.TAG_USER_RESTRICTION_ADDED:
441-
eventTag = "USER_RESTRICTION_ADDED";
442-
break;
443-
case SecurityLog.TAG_USER_RESTRICTION_REMOVED:
444-
eventTag = "USER_RESTRICTION_REMOVED";
445-
break;
446-
case SecurityLog.TAG_CERT_AUTHORITY_INSTALLED:
447-
eventTag = "CERT_AUTHORITY_INSTALLED";
448-
break;
449-
case SecurityLog.TAG_CERT_AUTHORITY_REMOVED:
450-
eventTag = "CERT_AUTHORITY_REMOVED";
451-
break;
452-
case SecurityLog.TAG_CRYPTO_SELF_TEST_COMPLETED:
453-
eventTag = "CRYPTO_SELF_TEST_COMPLETED";
454-
break;
455-
case SecurityLog.TAG_KEY_INTEGRITY_VIOLATION:
456-
eventTag = "KEY_INTEGRITY_VIOLATION";
457-
break;
458-
case SecurityLog.TAG_CERT_VALIDATION_FAILURE:
459-
eventTag = "CERT_VALIDATION_FAILURE";
460-
break;
461-
default:
462-
eventTag = "UNKNOWN(" + eventId + ")";
463-
}
464-
return eventTag;
465-
}
466357
}

‎src/main/java/com/afwsamples/testdpc/policy/SecurityLogsFragment.java

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.annotation.TargetApi;
2020
import android.app.ListFragment;
2121
import android.app.admin.DevicePolicyManager;
22+
import android.app.admin.SecurityLog;
2223
import android.app.admin.SecurityLog.SecurityEvent;
2324
import android.content.ComponentName;
2425
import android.content.Context;
@@ -130,7 +131,7 @@ private void processEvents(List<SecurityEvent> logs) {
130131
if (Util.SDK_INT >= VERSION_CODES.P) {
131132
sb.append(event.getId() + ": ");
132133
}
133-
sb.append(Util.getStringEventTagFromId(event.getTag()));
134+
sb.append(getStringEventTagFromId(event.getTag()));
134135
sb.append(" (")
135136
.append(formatter.format(new Date(TimeUnit.NANOSECONDS.toMillis(event.getTimeNanos()))))
136137
.append("): ");
@@ -142,6 +143,114 @@ private void processEvents(List<SecurityEvent> logs) {
142143
}
143144
}
144145

146+
public static String getStringEventTagFromId(int eventId) {
147+
final String eventTag;
148+
switch (eventId) {
149+
case SecurityLog.TAG_ADB_SHELL_INTERACTIVE:
150+
eventTag = "ADB_SHELL_INTERACTIVE";
151+
break;
152+
case SecurityLog.TAG_ADB_SHELL_CMD:
153+
eventTag = "ADB_SHELL_CMD";
154+
break;
155+
case SecurityLog.TAG_SYNC_RECV_FILE:
156+
eventTag = "SYNC_RECV_FILE";
157+
break;
158+
case SecurityLog.TAG_SYNC_SEND_FILE:
159+
eventTag = "SYNC_SEND_FILE";
160+
break;
161+
case SecurityLog.TAG_APP_PROCESS_START:
162+
eventTag = "APP_PROCESS_START";
163+
break;
164+
case SecurityLog.TAG_KEYGUARD_DISMISSED:
165+
eventTag = "KEYGUARD_DISMISSED";
166+
break;
167+
case SecurityLog.TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT:
168+
eventTag = "KEYGUARD_DISMISS_AUTH_ATTEMPT";
169+
break;
170+
case SecurityLog.TAG_KEYGUARD_SECURED:
171+
eventTag = "KEYGUARD_SECURED";
172+
break;
173+
case SecurityLog.TAG_OS_STARTUP:
174+
eventTag = "OS_STARTUP";
175+
break;
176+
case SecurityLog.TAG_OS_SHUTDOWN:
177+
eventTag = "OS_SHUTDOWN";
178+
break;
179+
case SecurityLog.TAG_LOGGING_STARTED:
180+
eventTag = "LOGGING_STARTED";
181+
break;
182+
case SecurityLog.TAG_LOGGING_STOPPED:
183+
eventTag = "LOGGING_STOPPED";
184+
break;
185+
case SecurityLog.TAG_MEDIA_MOUNT:
186+
eventTag = "MEDIA_MOUNT";
187+
break;
188+
case SecurityLog.TAG_MEDIA_UNMOUNT:
189+
eventTag = "MEDIA_UNMOUNT";
190+
break;
191+
case SecurityLog.TAG_LOG_BUFFER_SIZE_CRITICAL:
192+
eventTag = "LOG_BUFFER_SIZE_CRITICAL";
193+
break;
194+
case SecurityLog.TAG_PASSWORD_EXPIRATION_SET:
195+
eventTag = "PASSWORD_EXPIRATION_SET";
196+
break;
197+
case SecurityLog.TAG_PASSWORD_COMPLEXITY_SET:
198+
eventTag = "PASSWORD_COMPLEXITY_SET";
199+
break;
200+
case SecurityLog.TAG_PASSWORD_HISTORY_LENGTH_SET:
201+
eventTag = "PASSWORD_HISTORY_LENGTH_SET";
202+
break;
203+
case SecurityLog.TAG_MAX_SCREEN_LOCK_TIMEOUT_SET:
204+
eventTag = "MAX_SCREEN_LOCK_TIMEOUT_SET";
205+
break;
206+
case SecurityLog.TAG_MAX_PASSWORD_ATTEMPTS_SET:
207+
eventTag = "MAX_PASSWORD_ATTEMPTS_SET";
208+
break;
209+
case SecurityLog.TAG_KEYGUARD_DISABLED_FEATURES_SET:
210+
eventTag = "KEYGUARD_DISABLED_FEATURES_SET";
211+
break;
212+
case SecurityLog.TAG_REMOTE_LOCK:
213+
eventTag = "REMOTE_LOCK";
214+
break;
215+
case SecurityLog.TAG_WIPE_FAILURE:
216+
eventTag = "WIPE_FAILURE";
217+
break;
218+
case SecurityLog.TAG_KEY_GENERATED:
219+
eventTag = "KEY_GENERATED";
220+
break;
221+
case SecurityLog.TAG_KEY_IMPORT:
222+
eventTag = "KEY_IMPORT";
223+
break;
224+
case SecurityLog.TAG_KEY_DESTRUCTION:
225+
eventTag = "KEY_DESTRUCTION";
226+
break;
227+
case SecurityLog.TAG_USER_RESTRICTION_ADDED:
228+
eventTag = "USER_RESTRICTION_ADDED";
229+
break;
230+
case SecurityLog.TAG_USER_RESTRICTION_REMOVED:
231+
eventTag = "USER_RESTRICTION_REMOVED";
232+
break;
233+
case SecurityLog.TAG_CERT_AUTHORITY_INSTALLED:
234+
eventTag = "CERT_AUTHORITY_INSTALLED";
235+
break;
236+
case SecurityLog.TAG_CERT_AUTHORITY_REMOVED:
237+
eventTag = "CERT_AUTHORITY_REMOVED";
238+
break;
239+
case SecurityLog.TAG_CRYPTO_SELF_TEST_COMPLETED:
240+
eventTag = "CRYPTO_SELF_TEST_COMPLETED";
241+
break;
242+
case SecurityLog.TAG_KEY_INTEGRITY_VIOLATION:
243+
eventTag = "KEY_INTEGRITY_VIOLATION";
244+
break;
245+
case SecurityLog.TAG_CERT_VALIDATION_FAILURE:
246+
eventTag = "CERT_VALIDATION_FAILURE";
247+
break;
248+
default:
249+
eventTag = "UNKNOWN(" + eventId + ")";
250+
}
251+
return eventTag;
252+
}
253+
145254
public static void printData(StringBuilder sb, Object data) {
146255
if (data instanceof Integer
147256
|| data instanceof Long

0 commit comments

Comments
 (0)