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

Commit 4b9b7c38 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Add custom CloseGuard.Reporter for StrictMode 

StrictMode now replaces the default CloseGuard.Reporter with one that
calls onVmPolicyViolation, which is a renamed version of
onSqliteObjectLeaked.

Change-Id: Iea980662e2ee91939960c83b8768a8172379617a
parent 3a3f24e3

core/java/android/os/StrictMode.java

+22 −1
Original line number Diff line number Diff line
@@ -600,6 +600,14 @@ public final class StrictMode { 
        }

    }



    // Sets up CloseGuard in Dalvik/libcore

    private static void setCloseGuardEnabled(boolean enabled) {

        if (!(CloseGuard.getReporter() instanceof AndroidBlockGuardPolicy)) {

            CloseGuard.setReporter(new AndroidCloseGuardReporter());

        }

        CloseGuard.setEnabled(enabled);

    }



    private static class StrictModeNetworkViolation extends BlockGuard.BlockGuardPolicyException {

        public StrictModeNetworkViolation(int policyMask) {

            super(policyMask, DETECT_NETWORK);
@@ -1026,6 +1034,12 @@ public final class StrictMode { 
        }

    }



    private static class AndroidCloseGuardReporter implements CloseGuard.Reporter {

        public void report (String message, Throwable allocationSite) {

            onVmPolicyViolation(message, allocationSite);

        }

    }



    /**

     * Called from Parcel.writeNoException()

     */
@@ -1051,7 +1065,7 @@ public final class StrictMode { 
     */

    public static void setVmPolicy(final VmPolicy policy) {

        sVmPolicyMask = policy.mask;

        CloseGuard.setEnabled(vmClosableObjectLeaksEnabled());

        setCloseGuardEnabled(vmClosableObjectLeaksEnabled());

    }



    /**
@@ -1099,6 +1113,13 @@ public final class StrictMode { 
     * @hide

     */

    public static void onSqliteObjectLeaked(String message, Throwable originStack) {

        onVmPolicyViolation(message, originStack);

    }



    /**

     * @hide

     */

    public static void onVmPolicyViolation(String message, Throwable originStack) {

        if ((sVmPolicyMask & PENALTY_LOG) != 0) {

            Log.e(TAG, message, originStack);

        }