diff options
| author | 2023-04-06 13:51:04 +0000 | |
|---|---|---|
| committer | 2023-04-06 13:51:04 +0000 | |
| commit | e89b9e89f519cab5742681851234006a4a7ae1df (patch) | |
| tree | c1cf9cd8969fd31656c024b28a7ca7e0611fc8bd /tests/DynamicCodeLoggerIntegrationTests/src | |
| parent | 8a70de0642c54c4b63a2b9d455504d84927cdf80 (diff) | |
| parent | 71b946c62d4b376eafcbbda1bdd23280d1f5df81 (diff) | |
Merge "Make AVC log parsing less strict" am: de8dd4aabb am: 71b946c62d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2527285
Change-Id: Ia3196d05cd98b448629edd0d4b0cc79205c7fd7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src')
| -rw-r--r-- | tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java index 5430dee5ca31..afa4ff80b6e3 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java +++ b/tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java @@ -84,7 +84,7 @@ public final class DynamicCodeLoggerIntegrationTests { // avoid flakiness we run these tests multiple times, allowing progressively longer between // code loading and checking the logs on each try.) private static final int AUDIT_LOG_RETRIES = 10; - private static final int RETRY_DELAY_MS = 2_000; + private static final int RETRY_DELAY_MS = 500; private static Context sContext; private static int sMyUid; @@ -245,7 +245,7 @@ public final class DynamicCodeLoggerIntegrationTests { "/DynamicCodeLoggerNativeExecutable", privateCopyFile); EventLog.writeEvent(EventLog.getTagCode("auditd"), - "type=1400 avc: granted { execute_no_trans } " + "type=1400 avc: granted { execute_no_trans } " + "path=\"" + privateCopyFile + "\" " + "scontext=u:r:untrusted_app: " + "tcontext=u:object_r:app_data_file: " |