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

Commit 7cd3fa6f authored by Kurt Nelson's avatar Kurt Nelson Committed by Android (Google) Code Review
Browse files

Merge "Show Extensible StrictMode APIs"

parents 5e22f57b 0e612808

api/current.txt

+66 −0
Original line number Diff line number Diff line
@@ -31840,6 +31840,14 @@ package android.os { 
    method public static void setVmPolicy(android.os.StrictMode.VmPolicy);

  }













  public static abstract interface StrictMode.OnThreadViolationListener {













    method public abstract void onThreadViolation(android.os.strictmode.Violation);













  }

























  public static abstract interface StrictMode.OnVmViolationListener {













    method public abstract void onVmViolation(android.os.strictmode.Violation);













  }



























  public static final class StrictMode.ThreadPolicy {















    field public static final android.os.StrictMode.ThreadPolicy LAX;















  }









@@ -31860,6 +31868,7 @@ package android.os {













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();















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















    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(android.os.StrictMode.OnThreadViolationListener, java.util.concurrent.Executor);















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















    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();















    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();










@@ -31891,6 +31900,7 @@ package android.os {













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















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















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













    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(android.os.StrictMode.OnVmViolationListener, java.util.concurrent.Executor);















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















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















  }










@@ -32255,6 +32265,62 @@ package android.os.storage {



























}



























package android.os.strictmode {

























  public final class CleartextNetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ContentUriWithoutPermissionViolation extends android.os.strictmode.Violation {













  }

























  public final class CustomViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskReadViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskWriteViolation extends android.os.strictmode.Violation {













  }

























  public final class FileUriExposedViolation extends android.os.strictmode.Violation {













  }

























  public class InstanceCountViolation extends android.os.strictmode.Violation {













    method public long getNumberOfInstances();













  }

























  public final class IntentReceiverLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class LeakedClosableViolation extends android.os.strictmode.Violation {













  }

























  public final class NetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ResourceMismatchViolation extends android.os.strictmode.Violation {













  }

























  public final class ServiceConnectionLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class SqliteObjectLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class UnbufferedIoViolation extends android.os.strictmode.Violation {













  }

























  public final class UntaggedSocketViolation extends android.os.strictmode.Violation {













  }

























  public abstract class Violation extends java.lang.Throwable {













  }

























  public final class WebViewMethodCalledOnWrongThreadViolation extends android.os.strictmode.Violation {













  }

























}



























package android.preference {





























  public class CheckBoxPreference extends android.preference.TwoStatePreference {

























api/system-current.txt



+66
−0




























Original line number
Diff line number
Diff line








@@ -34629,6 +34629,14 @@ package android.os {













    method public static void setVmPolicy(android.os.StrictMode.VmPolicy);















  }



























  public static abstract interface StrictMode.OnThreadViolationListener {













    method public abstract void onThreadViolation(android.os.strictmode.Violation);













  }

























  public static abstract interface StrictMode.OnVmViolationListener {













    method public abstract void onVmViolation(android.os.strictmode.Violation);













  }



























  public static final class StrictMode.ThreadPolicy {















    field public static final android.os.StrictMode.ThreadPolicy LAX;















  }









@@ -34649,6 +34657,7 @@ package android.os {













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();















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















    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(android.os.StrictMode.OnThreadViolationListener, java.util.concurrent.Executor);















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















    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();















    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();










@@ -34680,6 +34689,7 @@ package android.os {













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















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















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













    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(android.os.StrictMode.OnVmViolationListener, java.util.concurrent.Executor);















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















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















  }










@@ -35127,6 +35137,62 @@ package android.os.storage {



























}



























package android.os.strictmode {

























  public final class CleartextNetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ContentUriWithoutPermissionViolation extends android.os.strictmode.Violation {













  }

























  public final class CustomViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskReadViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskWriteViolation extends android.os.strictmode.Violation {













  }

























  public final class FileUriExposedViolation extends android.os.strictmode.Violation {













  }

























  public class InstanceCountViolation extends android.os.strictmode.Violation {













    method public long getNumberOfInstances();













  }

























  public final class IntentReceiverLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class LeakedClosableViolation extends android.os.strictmode.Violation {













  }

























  public final class NetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ResourceMismatchViolation extends android.os.strictmode.Violation {













  }

























  public final class ServiceConnectionLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class SqliteObjectLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class UnbufferedIoViolation extends android.os.strictmode.Violation {













  }

























  public final class UntaggedSocketViolation extends android.os.strictmode.Violation {













  }

























  public abstract class Violation extends java.lang.Throwable {













  }

























  public final class WebViewMethodCalledOnWrongThreadViolation extends android.os.strictmode.Violation {













  }

























}



























package android.permissionpresenterservice {





























  public abstract class RuntimePermissionPresenterService extends android.app.Service {

























api/test-current.txt



+66
−0




























Original line number
Diff line number
Diff line








@@ -32082,6 +32082,14 @@ package android.os {













    field public static final int DETECT_VM_UNTAGGED_SOCKET = -2147483648; // 0x80000000















  }



























  public static abstract interface StrictMode.OnThreadViolationListener {













    method public abstract void onThreadViolation(android.os.strictmode.Violation);













  }

























  public static abstract interface StrictMode.OnVmViolationListener {













    method public abstract void onVmViolation(android.os.strictmode.Violation);













  }



























  public static final class StrictMode.ThreadPolicy {















    field public static final android.os.StrictMode.ThreadPolicy LAX;















  }









@@ -32102,6 +32110,7 @@ package android.os {













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();















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















    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(android.os.StrictMode.OnThreadViolationListener, java.util.concurrent.Executor);















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















    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();















    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();










@@ -32157,6 +32166,7 @@ package android.os {













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















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















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













    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(android.os.StrictMode.OnVmViolationListener, java.util.concurrent.Executor);















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















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















  }










@@ -32524,6 +32534,62 @@ package android.os.storage {



























}



























package android.os.strictmode {

























  public final class CleartextNetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ContentUriWithoutPermissionViolation extends android.os.strictmode.Violation {













  }

























  public final class CustomViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskReadViolation extends android.os.strictmode.Violation {













  }

























  public final class DiskWriteViolation extends android.os.strictmode.Violation {













  }

























  public final class FileUriExposedViolation extends android.os.strictmode.Violation {













  }

























  public class InstanceCountViolation extends android.os.strictmode.Violation {













    method public long getNumberOfInstances();













  }

























  public final class IntentReceiverLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class LeakedClosableViolation extends android.os.strictmode.Violation {













  }

























  public final class NetworkViolation extends android.os.strictmode.Violation {













  }

























  public final class ResourceMismatchViolation extends android.os.strictmode.Violation {













  }

























  public final class ServiceConnectionLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class SqliteObjectLeakedViolation extends android.os.strictmode.Violation {













  }

























  public final class UnbufferedIoViolation extends android.os.strictmode.Violation {













  }

























  public final class UntaggedSocketViolation extends android.os.strictmode.Violation {













  }

























  public abstract class Violation extends java.lang.Throwable {













  }

























  public final class WebViewMethodCalledOnWrongThreadViolation extends android.os.strictmode.Violation {













  }

























}



























package android.preference {





























  public class CheckBoxPreference extends android.preference.TwoStatePreference {

























core/java/android/os/StrictMode.java



+3
−13




























Original line number
Diff line number
Diff line








@@ -29,8 +29,6 @@ import android.content.ServiceConnection;













import android.content.pm.ApplicationInfo;















import android.net.TrafficStats;















import android.net.Uri;













import android.os.StrictMode.ThreadPolicy;













import android.os.StrictMode.VmPolicy;















import android.os.strictmode.CleartextNetworkViolation;















import android.os.strictmode.ContentUriWithoutPermissionViolation;















import android.os.strictmode.CustomViolation;









@@ -44,7 +42,7 @@ import android.os.strictmode.NetworkViolation;













import android.os.strictmode.ResourceMismatchViolation;















import android.os.strictmode.ServiceConnectionLeakedViolation;















import android.os.strictmode.SqliteObjectLeakedViolation;













import android.os.strictmode.UnbufferedIOViolation;













import android.os.strictmode.UnbufferedIoViolation;















import android.os.strictmode.UntaggedSocketViolation;















import android.os.strictmode.Violation;















import android.os.strictmode.WebViewMethodCalledOnWrongThreadViolation;










@@ -385,8 +383,6 @@ public final class StrictMode {













    /**















     * When #{@link ThreadPolicy.Builder#penaltyListener} is enabled, the listener is called on the















     * provided executor when a Thread violation occurs.













     *













     * @hide















     */















    public interface OnThreadViolationListener {















        /** Called on a thread policy violation. */









@@ -396,8 +392,6 @@ public final class StrictMode {













    /**















     * When #{@link VmPolicy.Builder#penaltyListener} is enabled, the listener is called on the















     * provided executor when a VM violation occurs.













     *













     * @hide















     */















    public interface OnVmViolationListener {















        /** Called on a VM policy violation. */










@@ -640,8 +634,6 @@ public final class StrictMode {













            /**















             * Call #{@link OnThreadViolationListener#onThreadViolation(Violation)} on specified















             * executor every violation.













             *













             * @hide















             */















            public Builder penaltyListener(















                    @NonNull OnThreadViolationListener listener, @NonNull Executor executor) {










@@ -977,8 +969,6 @@ public final class StrictMode {





























            /**















             * Call #{@link OnVmViolationListener#onVmViolation(Violation)} on every violation.













             *













             * @hide















             */















            public Builder penaltyListener(















                    @NonNull OnVmViolationListener listener, @NonNull Executor executor) {










@@ -1449,7 +1439,7 @@ public final class StrictMode {













            if (tooManyViolationsThisLoop()) {















                return;















            }













            startHandlingViolationException(new UnbufferedIOViolation());













            startHandlingViolationException(new UnbufferedIoViolation());















        }































        // Part of BlockGuard.Policy interface:










@@ -2552,7 +2542,7 @@ public final class StrictMode {













                return DETECT_CUSTOM;















            } else if (mViolation instanceof ResourceMismatchViolation) {















                return DETECT_RESOURCE_MISMATCH;













            } else if (mViolation instanceof UnbufferedIOViolation) {













            } else if (mViolation instanceof UnbufferedIoViolation) {















                return DETECT_UNBUFFERED_IO;















            } else if (mViolation instanceof SqliteObjectLeakedViolation) {















                return DETECT_VM_CURSOR_LEAKS;

































core/java/android/os/strictmode/CleartextNetworkViolation.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -15,8 +15,8 @@













 */















package android.os.strictmode;





























/** @hide */















public final class CleartextNetworkViolation extends Violation {













    /** @hide */















    public CleartextNetworkViolation(String msg) {















        super(msg);















    }