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

Commit b0e0c87d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "StrictMode: fix race condition in onVmPolicyViolation" into main am:... 

Merge "StrictMode: fix race condition in onVmPolicyViolation" into main am: c49b89ef am: 4569f000

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



Change-Id: Iec58b5e013394ba4e39f925e8951aa41962e7f46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 490b996c 4569f000

core/java/android/os/StrictMode.java

+8 −7
Original line number Diff line number Diff line
@@ -2440,11 +2440,12 @@ public final class StrictMode { 


    /** @hide */

    public static void onVmPolicyViolation(Violation violation, boolean forceDeath) {

        final boolean penaltyDropbox = (sVmPolicy.mask & PENALTY_DROPBOX) != 0;

        final boolean penaltyDeath = ((sVmPolicy.mask & PENALTY_DEATH) != 0) || forceDeath;

        final boolean penaltyLog = (sVmPolicy.mask & PENALTY_LOG) != 0;

        final VmPolicy vmPolicy = getVmPolicy();

        final boolean penaltyDropbox = (vmPolicy.mask & PENALTY_DROPBOX) != 0;

        final boolean penaltyDeath = ((vmPolicy.mask & PENALTY_DEATH) != 0) || forceDeath;

        final boolean penaltyLog = (vmPolicy.mask & PENALTY_LOG) != 0;



        final int penaltyMask = (sVmPolicy.mask & PENALTY_ALL);

        final int penaltyMask = (vmPolicy.mask & PENALTY_ALL);

        final ViolationInfo info = new ViolationInfo(violation, penaltyMask);



        // Erase stuff not relevant for process-wide violations
@@ -2497,10 +2498,10 @@ public final class StrictMode { 


        // If penaltyDeath, we can't guarantee this callback finishes before the process dies for

        // all executors. penaltyDeath supersedes penaltyCallback.

        if (sVmPolicy.mListener != null && sVmPolicy.mCallbackExecutor != null) {

            final OnVmViolationListener listener = sVmPolicy.mListener;

        if (vmPolicy.mListener != null && vmPolicy.mCallbackExecutor != null) {

            final OnVmViolationListener listener = vmPolicy.mListener;

            try {

                sVmPolicy.mCallbackExecutor.execute(

                vmPolicy.mCallbackExecutor.execute(

                        () -> {

                            // Lift violated policy to prevent infinite recursion.

                            VmPolicy oldPolicy = allowVmViolations();