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

Commit fbf3e9df authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Public API for StrictMode cleartext detection."

parents 6fc90d59 2e571641

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -22612,11 +22612,13 @@ package android.os { 
    method public android.os.StrictMode.VmPolicy build();

    method public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();

    method public android.os.StrictMode.VmPolicy.Builder detectAll();

    method public android.os.StrictMode.VmPolicy.Builder detectCleartextNetwork();

    method public android.os.StrictMode.VmPolicy.Builder detectFileUriExposure();

    method public android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects();

    method public android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects();

    method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();

    method public android.os.StrictMode.VmPolicy.Builder penaltyLog();

    method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

core/java/android/os/StrictMode.java

+1 −4
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public final class StrictMode { 
     * in {@link VmPolicy.Builder#detectAll()}. Apps can still always opt-into

     * detection using {@link VmPolicy.Builder#detectCleartextNetwork()}.

     */

    private static final String CLEARTEXT_PROPERTY = "persist.sys.strictmode.nonssl";

    private static final String CLEARTEXT_PROPERTY = "persist.sys.strictmode.clear";



    // Only log a duplicate stack trace to the logs every second.

    private static final long MIN_LOG_INTERVAL_MS = 1000;
@@ -763,8 +763,6 @@ public final class StrictMode { 
             * This inspects both IPv4/IPv6 and TCP/UDP network traffic, but it

             * may be subject to false positives, such as when STARTTLS

             * protocols or HTTP proxies are used.

             *

             * @hide

             */

            public Builder detectCleartextNetwork() {

                return enable(DETECT_VM_CLEARTEXT_NETWORK);
@@ -784,7 +782,6 @@ public final class StrictMode { 
             * detected.

             *

             * @see #detectCleartextNetwork()

             * @hide

             */

            public Builder penaltyDeathOnCleartextNetwork() {

                return enable(PENALTY_DEATH_ON_CLEARTEXT_NETWORK);