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

Commit de8dd4aa authored by Alan Stokes's avatar Alan Stokes Committed by Gerrit Code Review
Browse files

Merge "Make AVC log parsing less strict"

parents 73482477 c8c65c61

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

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



    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]+)) .*"

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -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;