Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exposed UnsafeStateException as a public API."

Browse Source
This commit is contained in:
Felipe Leme
2020-11-12 01:54:51 +00:00
committed by Android (Google) Code Review
parent 62a648da25 766e6ae8c8
commit dd0fdcce9f
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -7403,6 +7403,12 @@ package android.app.admin {
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 {

6
core/api/current.txt
View File

@@ -7403,6 +7403,12 @@ package android.app.admin {
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 {

5
core/api/test-current.txt
View File

@@ -369,12 +369,17 @@ package android.app.admin {
method public boolean isCurrentInputMethodSetByOwner();
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 int OPERATION_LOCK_NOW = 1; // 0x1
}
public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
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 {

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2454,7 +2454,7 @@ public class DevicePolicyManager {
public @interface PersonalAppsSuspensionReason {}
/** @hide */
// TODO(b/172376923): make it TestApi
@TestApi
public static final int OPERATION_LOCK_NOW = 1;
// TODO(b/172376923) - add all operations

6
core/java/android/app/admin/UnsafeStateException.java
View File

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