Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d097af4 authored by Alan Stokes's avatar Alan Stokes Committed by Automerger Merge Worker
Browse files

Merge "Make AVC log parsing less strict" am: de8dd4aa am: 71b946c6 am:... 

Merge "Make AVC log parsing less strict" am: de8dd4aa am: 71b946c6 am: e89b9e89 am: 39d5b7d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2527285



Change-Id: Ib865f910f0d44ba456a84b10da7b866506b7ea3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 597f6511 39d5b7d4

services/core/java/com/android/server/pm/DynamicCodeLoggingService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ public class DynamicCodeLoggingService extends JobService { 
    private static final String AVC_PREFIX = "type=" + AUDIT_AVC + " ";

    private static final String AVC_PREFIX = "type=" + AUDIT_AVC + " ";





    private static final Pattern EXECUTE_NATIVE_AUDIT_PATTERN =

    private static final Pattern EXECUTE_NATIVE_AUDIT_PATTERN =

            Pattern.compile(".*\\bavc: granted \\{ execute(?:_no_trans|) \\} .*"

            Pattern.compile(".*\\bavc: +granted +\\{ execute(?:_no_trans|) \\} .*"

                    + "\\bpath=(?:\"([^\" ]*)\"|([0-9A-F]+)) .*"

                    + "\\bpath=(?:\"([^\" ]*)\"|([0-9A-F]+)) .*"

                    + "\\bscontext=u:r:untrusted_app(?:_25|_27)?:.*"

                    + "\\bscontext=u:r:untrusted_app(?:_25|_27)?:.*"

                    + "\\btcontext=u:object_r:app_data_file:.*"

                    + "\\btcontext=u:object_r:app_data_file:.*"

tests/DynamicCodeLoggerIntegrationTests/src/com/android/server/pm/dex/DynamicCodeLoggerIntegrationTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ public final class DynamicCodeLoggerIntegrationTests { 
    // avoid flakiness we run these tests multiple times, allowing progressively longer between

    // avoid flakiness we run these tests multiple times, allowing progressively longer between

    // code loading and checking the logs on each try.)

    // code loading and checking the logs on each try.)

    private static final int AUDIT_LOG_RETRIES = 10;

    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 Context sContext;

    private static int sMyUid;

    private static int sMyUid;