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

Commit e05216c2 authored by Reema Bajwa's avatar Reema Bajwa Committed by Automerger Merge Worker
Browse files

Merge "Hide CredentialOption constructor" into udc-dev am: f9a644df am: e64429dd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22511615



Change-Id: I4fdf0fb67f1f22576def6dd163ce24e1059e7eca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccaaca66 e64429dd

core/api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -13679,7 +13679,6 @@ package android.credentials { 
  }

  }

















  public final class CredentialOption implements android.os.Parcelable {







  public final class CredentialOption implements android.os.Parcelable {











    ctor @Deprecated public CredentialOption(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.Bundle, boolean);














    method public int describeContents();







    method public int describeContents();











    method @NonNull public java.util.Set<android.content.ComponentName> getAllowedProviders();







    method @NonNull public java.util.Set<android.content.ComponentName> getAllowedProviders();











    method @NonNull public android.os.Bundle getCandidateQueryData();







    method @NonNull public android.os.Bundle getCandidateQueryData();

























core/java/android/credentials/CredentialOption.java



+2
−4




























Original line number
Original line
Diff line number
Diff line








@@ -37,8 +37,7 @@ import java.util.Set;





























/**







/**











 * Information about a specific type of credential to be requested during a {@link







 * Information about a specific type of credential to be requested during a {@link











 * CredentialManager#getCredential(GetCredentialRequest, Activity, CancellationSignal, Executor,







 * CredentialManager#getCredential} operation.











 * OutcomeReceiver)} operation.














 */







 */











public final class CredentialOption implements Parcelable {







public final class CredentialOption implements Parcelable {






























@@ -196,9 +195,8 @@ public final class CredentialOption implements Parcelable {









     * @throws NullPointerException If {@code credentialRetrievalData}, or







     * @throws NullPointerException If {@code credentialRetrievalData}, or











     * {@code candidateQueryData} is null.







     * {@code candidateQueryData} is null.











     *







     *











     * @deprecated replaced by Builder







     * @hide











     */







     */











    @Deprecated














    public CredentialOption(







    public CredentialOption(











            @NonNull String type,







            @NonNull String type,











            @NonNull Bundle credentialRetrievalData,







            @NonNull Bundle credentialRetrievalData,