diff options
Diffstat (limited to 'core/java/android')
18 files changed, 29 insertions, 38 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 02c82d71d5bd..f90604abf293 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -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; diff --git a/core/java/android/os/strictmode/CleartextNetworkViolation.java b/core/java/android/os/strictmode/CleartextNetworkViolation.java index 893780ddf17b..6a0d381d9b14 100644 --- a/core/java/android/os/strictmode/CleartextNetworkViolation.java +++ b/core/java/android/os/strictmode/CleartextNetworkViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class CleartextNetworkViolation extends Violation { + /** @hide */ public CleartextNetworkViolation(String msg) { super(msg); } diff --git a/core/java/android/os/strictmode/ContentUriWithoutPermissionViolation.java b/core/java/android/os/strictmode/ContentUriWithoutPermissionViolation.java index 017c4f991ec0..e78dc79d9628 100644 --- a/core/java/android/os/strictmode/ContentUriWithoutPermissionViolation.java +++ b/core/java/android/os/strictmode/ContentUriWithoutPermissionViolation.java @@ -17,8 +17,8 @@ package android.os.strictmode; import android.net.Uri; -/** @hide */ public final class ContentUriWithoutPermissionViolation extends Violation { + /** @hide */ public ContentUriWithoutPermissionViolation(Uri uri, String location) { super( uri diff --git a/core/java/android/os/strictmode/CustomViolation.java b/core/java/android/os/strictmode/CustomViolation.java index bc1656d055f4..d4ad06715004 100644 --- a/core/java/android/os/strictmode/CustomViolation.java +++ b/core/java/android/os/strictmode/CustomViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class CustomViolation extends Violation { + /** @hide */ public CustomViolation(String name) { super(name); } diff --git a/core/java/android/os/strictmode/DiskReadViolation.java b/core/java/android/os/strictmode/DiskReadViolation.java index 2edd33ed8f5e..fad32dbf89ed 100644 --- a/core/java/android/os/strictmode/DiskReadViolation.java +++ b/core/java/android/os/strictmode/DiskReadViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class DiskReadViolation extends Violation { + /** @hide */ public DiskReadViolation() { super(null); } diff --git a/core/java/android/os/strictmode/DiskWriteViolation.java b/core/java/android/os/strictmode/DiskWriteViolation.java index 6465718ef327..cb9ca3815fe1 100644 --- a/core/java/android/os/strictmode/DiskWriteViolation.java +++ b/core/java/android/os/strictmode/DiskWriteViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class DiskWriteViolation extends Violation { + /** @hide */ public DiskWriteViolation() { super(null); } diff --git a/core/java/android/os/strictmode/FileUriExposedViolation.java b/core/java/android/os/strictmode/FileUriExposedViolation.java index 5f71ee5c1278..e3e6f8334a98 100644 --- a/core/java/android/os/strictmode/FileUriExposedViolation.java +++ b/core/java/android/os/strictmode/FileUriExposedViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class FileUriExposedViolation extends Violation { + /** @hide */ public FileUriExposedViolation(String msg) { super(msg); } diff --git a/core/java/android/os/strictmode/InstanceCountViolation.java b/core/java/android/os/strictmode/InstanceCountViolation.java index d3da8009b94b..9ee2c8e5dc26 100644 --- a/core/java/android/os/strictmode/InstanceCountViolation.java +++ b/core/java/android/os/strictmode/InstanceCountViolation.java @@ -15,7 +15,6 @@ */ package android.os.strictmode; -/** @hide */ public class InstanceCountViolation extends Violation { private final long mInstances; @@ -24,6 +23,7 @@ public class InstanceCountViolation extends Violation { "android.os.StrictMode", "setClassInstanceLimit", "StrictMode.java", 1) }; + /** @hide */ public InstanceCountViolation(Class klass, long instances, int limit) { super(klass.toString() + "; instances=" + instances + "; limit=" + limit); setStackTrace(FAKE_STACK); diff --git a/core/java/android/os/strictmode/IntentReceiverLeakedViolation.java b/core/java/android/os/strictmode/IntentReceiverLeakedViolation.java index 1d1dfc0d0973..f416c94034c3 100644 --- a/core/java/android/os/strictmode/IntentReceiverLeakedViolation.java +++ b/core/java/android/os/strictmode/IntentReceiverLeakedViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class IntentReceiverLeakedViolation extends Violation { + /** @hide */ public IntentReceiverLeakedViolation(Throwable originStack) { super(null); setStackTrace(originStack.getStackTrace()); diff --git a/core/java/android/os/strictmode/LeakedClosableViolation.java b/core/java/android/os/strictmode/LeakedClosableViolation.java index de12533ce359..c795a6b89ec0 100644 --- a/core/java/android/os/strictmode/LeakedClosableViolation.java +++ b/core/java/android/os/strictmode/LeakedClosableViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class LeakedClosableViolation extends Violation { + /** @hide */ public LeakedClosableViolation(String message, Throwable allocationSite) { super(message); initCause(allocationSite); diff --git a/core/java/android/os/strictmode/NetworkViolation.java b/core/java/android/os/strictmode/NetworkViolation.java index 637d0b640fa5..abcf009dd98b 100644 --- a/core/java/android/os/strictmode/NetworkViolation.java +++ b/core/java/android/os/strictmode/NetworkViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class NetworkViolation extends Violation { + /** @hide */ public NetworkViolation() { super(null); } diff --git a/core/java/android/os/strictmode/ResourceMismatchViolation.java b/core/java/android/os/strictmode/ResourceMismatchViolation.java index 01ae7f8fa521..97c449938ede 100644 --- a/core/java/android/os/strictmode/ResourceMismatchViolation.java +++ b/core/java/android/os/strictmode/ResourceMismatchViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class ResourceMismatchViolation extends Violation { + /** @hide */ public ResourceMismatchViolation(Object tag) { super(tag.toString()); } diff --git a/core/java/android/os/strictmode/ServiceConnectionLeakedViolation.java b/core/java/android/os/strictmode/ServiceConnectionLeakedViolation.java index 5bab3bd46418..2d6b58f031c8 100644 --- a/core/java/android/os/strictmode/ServiceConnectionLeakedViolation.java +++ b/core/java/android/os/strictmode/ServiceConnectionLeakedViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class ServiceConnectionLeakedViolation extends Violation { + /** @hide */ public ServiceConnectionLeakedViolation(Throwable originStack) { super(null); setStackTrace(originStack.getStackTrace()); diff --git a/core/java/android/os/strictmode/SqliteObjectLeakedViolation.java b/core/java/android/os/strictmode/SqliteObjectLeakedViolation.java index 8360088a06f4..020022070475 100644 --- a/core/java/android/os/strictmode/SqliteObjectLeakedViolation.java +++ b/core/java/android/os/strictmode/SqliteObjectLeakedViolation.java @@ -15,9 +15,9 @@ */ package android.os.strictmode; -/** @hide */ public final class SqliteObjectLeakedViolation extends Violation { + /** @hide */ public SqliteObjectLeakedViolation(String message, Throwable originStack) { super(message); initCause(originStack); diff --git a/core/java/android/os/strictmode/UnbufferedIOViolation.java b/core/java/android/os/strictmode/UnbufferedIoViolation.java index 571ba50d1ab6..a5c326d1b98e 100644 --- a/core/java/android/os/strictmode/UnbufferedIOViolation.java +++ b/core/java/android/os/strictmode/UnbufferedIoViolation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * Copyright 2017 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,14 @@ */ package android.os.strictmode; -/** @hide */ -public final class UnbufferedIOViolation extends Violation { - public UnbufferedIOViolation() { +import android.os.StrictMode.ThreadPolicy.Builder; + +/** + * See #{@link Builder#detectUnbufferedIo()} + */ +public final class UnbufferedIoViolation extends Violation { + /** @hide */ + public UnbufferedIoViolation() { super(null); } } diff --git a/core/java/android/os/strictmode/UntaggedSocketViolation.java b/core/java/android/os/strictmode/UntaggedSocketViolation.java index 9752753acf00..836a8b9dc633 100644 --- a/core/java/android/os/strictmode/UntaggedSocketViolation.java +++ b/core/java/android/os/strictmode/UntaggedSocketViolation.java @@ -15,13 +15,13 @@ */ package android.os.strictmode; -/** @hide */ public final class UntaggedSocketViolation extends Violation { /** @hide */ public static final String MESSAGE = "Untagged socket detected; use" + " TrafficStats.setThreadSocketTag() to track all network usage"; + /** @hide */ public UntaggedSocketViolation() { super(MESSAGE); } diff --git a/core/java/android/os/strictmode/Violation.java b/core/java/android/os/strictmode/Violation.java index ebae7fce3b27..31c7d584fd65 100644 --- a/core/java/android/os/strictmode/Violation.java +++ b/core/java/android/os/strictmode/Violation.java @@ -16,13 +16,9 @@ package android.os.strictmode; -/** - * Root class for all StrictMode violations. - * - * @hide - */ +/** Root class for all StrictMode violations. */ public abstract class Violation extends Throwable { - protected Violation(String message) { + Violation(String message) { super(message); } } diff --git a/core/java/android/os/strictmode/WebViewMethodCalledOnWrongThreadViolation.java b/core/java/android/os/strictmode/WebViewMethodCalledOnWrongThreadViolation.java index d4c557a18477..c328d1470b53 100644 --- a/core/java/android/os/strictmode/WebViewMethodCalledOnWrongThreadViolation.java +++ b/core/java/android/os/strictmode/WebViewMethodCalledOnWrongThreadViolation.java @@ -15,8 +15,8 @@ */ package android.os.strictmode; -/** @hide */ public final class WebViewMethodCalledOnWrongThreadViolation extends Violation { + /** @hide */ public WebViewMethodCalledOnWrongThreadViolation(Throwable originStack) { super(null); setStackTrace(originStack.getStackTrace()); |