Merge "Exposed UnsafeStateException as a public API." (dd0fdcce) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7403,6 +7403,12 @@ package android.app.admin {
	field public static final int ERROR_UNKNOWN = 1; // 0x1		field public static final int ERROR_UNKNOWN = 1; // 0x1
	}		}

			public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
			method public int describeContents();
			method public void writeToParcel(@NonNull android.os.Parcel, int);
			field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
			}

	}		}

	package android.app.assist {		package android.app.assist {

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7403,6 +7403,12 @@ package android.app.admin {
	field public static final int ERROR_UNKNOWN = 1; // 0x1		field public static final int ERROR_UNKNOWN = 1; // 0x1
	}		}

			public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
			method public int describeContents();
			method public void writeToParcel(@NonNull android.os.Parcel, int);
			field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
			}

	}		}

	package android.app.assist {		package android.app.assist {

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -369,12 +369,17 @@ package android.app.admin {
	method public boolean isCurrentInputMethodSetByOwner();		method public boolean isCurrentInputMethodSetByOwner();
	method public boolean isFactoryResetProtectionPolicySupported();		method public boolean isFactoryResetProtectionPolicySupported();
	field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";		field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";
			field public static final int OPERATION_LOCK_NOW = 1; // 0x1
	}		}

	public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {		public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
	ctor public SecurityLog.SecurityEvent(long, byte[]);		ctor public SecurityLog.SecurityEvent(long, byte[]);
	}		}

			public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
			method public int getOperation();
			}

	}		}

	package android.app.blob {		package android.app.blob {

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2454,7 +2454,7 @@ public class DevicePolicyManager {
	public @interface PersonalAppsSuspensionReason {}		public @interface PersonalAppsSuspensionReason {}

	/** @hide */		/** @hide */
	// TODO(b/172376923): make it TestApi		@TestApi
	public static final int OPERATION_LOCK_NOW = 1;		public static final int OPERATION_LOCK_NOW = 1;

	// TODO(b/172376923) - add all operations		// TODO(b/172376923) - add all operations

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	package android.app.admin;		package android.app.admin;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.TestApi;
	import android.app.admin.DevicePolicyManager.DevicePolicyOperation;		import android.app.admin.DevicePolicyManager.DevicePolicyOperation;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	@@ -27,10 +28,7 @@ import android.os.Parcelable;
	* <p>For example, it can be thrown on		* <p>For example, it can be thrown on
	* {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive devices} when the vehicle		* {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive devices} when the vehicle
	* is moving.		* is moving.
	*
	* @hide
	*/		*/
	// TODO(b/172376923): make it public
	@SuppressWarnings("serial")		@SuppressWarnings("serial")
	public final class UnsafeStateException extends IllegalStateException implements Parcelable {		public final class UnsafeStateException extends IllegalStateException implements Parcelable {

	@@ -44,7 +42,7 @@ public final class UnsafeStateException extends IllegalStateException implements
	}		}

	/** @hide */		/** @hide */
	// TODO(b/172376923): make it TestApi		@TestApi
	public @DevicePolicyOperation int getOperation() {		public @DevicePolicyOperation int getOperation() {
	return mOperation;		return mOperation;
	}		}