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

Commit 2e571641 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Public API for StrictMode cleartext detection. 

Bug: 18335678
Change-Id: I4c3fd72303ae86f0c85f99ce9bdfd2913296a256
parent d9d8ab2e

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);