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

Commit df6d37e5 authored by Ben Lin's avatar Ben Lin
Browse files

Introduce AuthenticationRequiredException, and @hide 

RecoverableSecurityException.

Test: CTS tests in changes in same topic.
Bug: 36482356
Bug: 36482258
Change-Id: I44b3407746006d8709e4a3f3ca2950c61fa0be95
parent 7ba04df3

api/current.txt

+8 −11
Original line number Diff line number Diff line
@@ -4293,6 +4293,14 @@ package android.app { 
    field public java.lang.String serviceDetails;

  }













  public final class AuthenticationRequiredException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public AuthenticationRequiredException(java.lang.Throwable, android.app.PendingIntent);













    method public int describeContents();













    method public android.app.PendingIntent getUserAction();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.AuthenticationRequiredException> CREATOR;













  }



























  public final class AutomaticZenRule implements android.os.Parcelable {















    ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);















    ctor public AutomaticZenRule(android.os.Parcel);










@@ -5700,17 +5708,6 @@ package android.app {













    field public static final int STYLE_SPINNER = 0; // 0x0















  }



























  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public RecoverableSecurityException(java.lang.Throwable, java.lang.CharSequence, android.app.RemoteAction);













    method public int describeContents();













    method public android.app.RemoteAction getUserAction();













    method public java.lang.CharSequence getUserMessage();













    method public void showAsDialog(android.app.Activity);













    method public void showAsNotification(android.content.Context, java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.RecoverableSecurityException> CREATOR;













  }



























  public final class RemoteAction implements android.os.Parcelable {















    ctor public RemoteAction(android.graphics.drawable.Icon, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);















    method public android.app.RemoteAction clone();

























api/system-current.txt



+8
−11




























Original line number
Diff line number
Diff line








@@ -4436,6 +4436,14 @@ package android.app {













    field public java.lang.String serviceDetails;















  }



























  public final class AuthenticationRequiredException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public AuthenticationRequiredException(java.lang.Throwable, android.app.PendingIntent);













    method public int describeContents();













    method public android.app.PendingIntent getUserAction();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.AuthenticationRequiredException> CREATOR;













  }



























  public final class AutomaticZenRule implements android.os.Parcelable {















    ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);















    ctor public AutomaticZenRule(android.os.Parcel);










@@ -5901,17 +5909,6 @@ package android.app {













    field public static final int STYLE_SPINNER = 0; // 0x0















  }



























  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public RecoverableSecurityException(java.lang.Throwable, java.lang.CharSequence, android.app.RemoteAction);













    method public int describeContents();













    method public android.app.RemoteAction getUserAction();













    method public java.lang.CharSequence getUserMessage();













    method public void showAsDialog(android.app.Activity);













    method public void showAsNotification(android.content.Context, java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.RecoverableSecurityException> CREATOR;













  }



























  public final class RemoteAction implements android.os.Parcelable {















    ctor public RemoteAction(android.graphics.drawable.Icon, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);















    method public android.app.RemoteAction clone();

























api/test-current.txt



+8
−11




























Original line number
Diff line number
Diff line








@@ -4303,6 +4303,14 @@ package android.app {













    field public java.lang.String serviceDetails;















  }



























  public final class AuthenticationRequiredException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public AuthenticationRequiredException(java.lang.Throwable, android.app.PendingIntent);













    method public int describeContents();













    method public android.app.PendingIntent getUserAction();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.AuthenticationRequiredException> CREATOR;













  }



























  public final class AutomaticZenRule implements android.os.Parcelable {















    ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);















    ctor public AutomaticZenRule(android.os.Parcel);










@@ -5711,17 +5719,6 @@ package android.app {













    field public static final int STYLE_SPINNER = 0; // 0x0















  }



























  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {













    ctor public RecoverableSecurityException(java.lang.Throwable, java.lang.CharSequence, android.app.RemoteAction);













    method public int describeContents();













    method public android.app.RemoteAction getUserAction();













    method public java.lang.CharSequence getUserMessage();













    method public void showAsDialog(android.app.Activity);













    method public void showAsNotification(android.content.Context, java.lang.String);













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.RecoverableSecurityException> CREATOR;













  }



























  public final class RemoteAction implements android.os.Parcelable {















    ctor public RemoteAction(android.graphics.drawable.Icon, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);















    method public android.app.RemoteAction clone();

























core/java/android/app/AuthenticationRequiredException.java
0 → 100644



+99
−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.app;



























import android.content.ContentProvider;













import android.content.ContentResolver;













import android.os.Parcel;













import android.os.Parcelable;



























import com.android.internal.util.Preconditions;



























/**













 * Specialization of {@link SecurityException} that is thrown when authentication is needed from the













 * end user before viewing the content.













 * <p>













 * This exception is only appropriate where there is a concrete action the user can take to













 * authorize and make forward progress, such as confirming or entering authentication credentials,













 * or granting access via other means.













 * <p class="note">













 * Note: legacy code that receives this exception may treat it as a general













 * {@link SecurityException}, and thus there is no guarantee that the action contained will be













 * invoked by the user.













 * </p>













 */













public final class AuthenticationRequiredException extends SecurityException implements Parcelable {













    private static final String TAG = "AuthenticationRequiredException";



























    private final PendingIntent mUserAction;



























    /** {@hide} */













    public AuthenticationRequiredException(Parcel in) {













        this(new SecurityException(in.readString()), PendingIntent.CREATOR.createFromParcel(in));













    }



























    /**













     * Create an instance ready to be thrown.













     *













     * @param cause original cause with details designed for engineering













     *            audiences.













     * @param userAction primary action that will initiate the recovery. This













     *            must launch an activity that is expected to set













     *            {@link Activity#setResult(int)} before finishing to













     *            communicate the final status of the recovery. For example,













     *            apps that observe {@link Activity#RESULT_OK} may choose to













     *            immediately retry their operation. If this exception was













     *            thrown from a {@link ContentProvider}, you should also send













     *            any relevant {@link ContentResolver#notifyChange} events to













     *            trigger reloading of data.













     */













    public AuthenticationRequiredException(Throwable cause, PendingIntent userAction) {













        super(cause.getMessage());













        mUserAction = Preconditions.checkNotNull(userAction);













    }



























    /**













     * Return primary action that will initiate the authorization.













     */













    public PendingIntent getUserAction() {













        return mUserAction;













    }



























    @Override













    public int describeContents() {













        return 0;













    }



























    @Override













    public void writeToParcel(Parcel dest, int flags) {













        dest.writeString(getMessage());













        mUserAction.writeToParcel(dest, flags);













    }



























    public static final Creator<AuthenticationRequiredException> CREATOR =













            new Creator<AuthenticationRequiredException>() {













        @Override













        public AuthenticationRequiredException createFromParcel(Parcel source) {













            return new AuthenticationRequiredException(source);













        }



























        @Override













        public AuthenticationRequiredException[] newArray(int size) {













            return new AuthenticationRequiredException[size];













        }













    };













}
























core/java/android/app/RecoverableSecurityException.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -45,7 +45,8 @@ import com.android.internal.util.Preconditions;













 * Note: legacy code that receives this exception may treat it as a general















 * {@link SecurityException}, and thus there is no guarantee that the messages















 * contained will be shown to the end user.













 * </p>













 *













 * @hide















 */















public final class RecoverableSecurityException extends SecurityException implements Parcelable {















    private static final String TAG = "RecoverableSecurityException";