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

Commit a5d1580e authored by Omer Ozer's avatar Omer Ozer Committed by Automerger Merge Worker
Browse files

Merge "Unhide CredentialEntry constructor." into udc-dev am: e13229fa 

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



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

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40645,6 +40645,7 @@ package android.service.credentials { 
  public class CredentialEntry implements android.os.Parcelable {

    ctor public CredentialEntry(@NonNull String, @NonNull String, @NonNull android.app.slice.Slice);

    ctor public CredentialEntry(@NonNull android.service.credentials.BeginGetCredentialOption, @NonNull android.app.slice.Slice);

    ctor public CredentialEntry(@NonNull String, @NonNull android.app.slice.Slice);

    method public int describeContents();

    method @NonNull public String getBeginGetCredentialOptionId();

    method @NonNull public android.app.slice.Slice getSlice();

core/java/android/service/credentials/CredentialEntry.java

+0 −2
Original line number Diff line number Diff line
@@ -131,9 +131,7 @@ public class CredentialEntry implements Parcelable { 
     * @param slice the slice containing the metadata to be shown on the UI. Must be

     *              constructed through the androidx.credentials jetpack library.

     *

     * @hide

     */

    // TODO: Unhide this constructor when the registry APIs are stable

    public CredentialEntry(@NonNull String type, @NonNull Slice slice) {

        mBeginGetCredentialOptionId = null;

        mType = requireNonNull(type, "type must not be null");