Merge "Structure StrictMode violations as Throwables" (df66dd92) · Commits · e / os / android_frameworks_base

api/test-current.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -32086,13 +32086,13 @@ package android.os {
		}

		public static final class StrictMode.ViolationInfo implements android.os.Parcelable {
		ctor public StrictMode.ViolationInfo();
		ctor public StrictMode.ViolationInfo(java.lang.Throwable, int);
		ctor public StrictMode.ViolationInfo(android.os.Parcel);
		ctor public StrictMode.ViolationInfo(android.os.Parcel, boolean);
		method public int describeContents();
		method public void dump(android.util.Printer, java.lang.String);
		method public int getPolicyMask();
		method public java.lang.String getStackTrace();
		method public int getViolationBit();
		method public java.lang.String getViolationDetails();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.StrictMode.ViolationInfo> CREATOR;
		@@ -32100,7 +32100,6 @@ package android.os {
		field public int durationMillis;
		field public int numAnimationsRunning;
		field public long numInstances;
		field public final int policy;
		field public java.lang.String[] tags;
		field public int violationNumThisLoop;
		field public long violationUptimeMillis;

+0 −6

Original line number	Diff line number	Diff line
		@@ -3340,14 +3340,8 @@ android.os.StrictMode$9
		android.os.StrictMode$AndroidBlockGuardPolicy
		android.os.StrictMode$AndroidBlockGuardPolicy$1
		android.os.StrictMode$AndroidCloseGuardReporter
		android.os.StrictMode$InstanceCountViolation
		android.os.StrictMode$InstanceTracker
		android.os.StrictMode$LogStackTrace
		android.os.StrictMode$Span
		android.os.StrictMode$StrictModeCustomViolation
		android.os.StrictMode$StrictModeDiskReadViolation
		android.os.StrictMode$StrictModeDiskWriteViolation
		android.os.StrictMode$StrictModeViolation
		android.os.StrictMode$ThreadPolicy
		android.os.StrictMode$ThreadPolicy$Builder
		android.os.StrictMode$ThreadSpanState

+0 −3

Original line number	Diff line number	Diff line
		@@ -1865,9 +1865,6 @@ android.os.StrictMode$InstanceCountViolation
		android.os.StrictMode$InstanceTracker
		android.os.StrictMode$LogStackTrace
		android.os.StrictMode$Span
		android.os.StrictMode$StrictModeDiskReadViolation
		android.os.StrictMode$StrictModeDiskWriteViolation
		android.os.StrictMode$StrictModeViolation
		android.os.StrictMode$ThreadPolicy
		android.os.StrictMode$ThreadPolicy$Builder
		android.os.StrictMode$ThreadSpanState

+127 −234

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.os.strictmode;

		/** @hide */
		public final class CleartextNetworkViolation extends Violation {
		public CleartextNetworkViolation(String msg) {
		super(msg);
		}
		}