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

Commit ca0e3a07 authored by Omer Ozer's avatar Omer Ozer Committed by Android (Google) Code Review
Browse files

Merge "Make Unregister request accept a set."

parents 11c017b7 c76175e1

core/api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -13541,9 +13541,9 @@ package android.credentials { 
















  public final class UnregisterCredentialDescriptionRequest implements android.os.Parcelable {







  public final class UnregisterCredentialDescriptionRequest implements android.os.Parcelable {











    ctor public UnregisterCredentialDescriptionRequest(@NonNull android.credentials.CredentialDescription);







    ctor public UnregisterCredentialDescriptionRequest(@NonNull android.credentials.CredentialDescription);











    ctor public UnregisterCredentialDescriptionRequest(@NonNull java.util.List<android.credentials.CredentialDescription>);







    ctor public UnregisterCredentialDescriptionRequest(@NonNull java.util.Set<android.credentials.CredentialDescription>);











    method public int describeContents();







    method public int describeContents();











    method @NonNull public java.util.List<android.credentials.CredentialDescription> getCredentialDescriptions();







    method @NonNull public java.util.Set<android.credentials.CredentialDescription> getCredentialDescriptions();











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







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











    field @NonNull public static final android.os.Parcelable.Creator<android.credentials.UnregisterCredentialDescriptionRequest> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.credentials.UnregisterCredentialDescriptionRequest> CREATOR;











  }







  }

























core/java/android/credentials/UnregisterCredentialDescriptionRequest.java



+5
−3




























Original line number
Original line
Diff line number
Diff line








@@ -27,7 +27,9 @@ import com.android.internal.util.AnnotationValidations;





























import java.util.ArrayList;







import java.util.ArrayList;











import java.util.Arrays;







import java.util.Arrays;














import java.util.HashSet;











import java.util.List;







import java.util.List;














import java.util.Set;



















































/**







/**









@@ -46,7 +48,7 @@ public final class UnregisterCredentialDescriptionRequest implements Parcelable









    }







    }































    public UnregisterCredentialDescriptionRequest(







    public UnregisterCredentialDescriptionRequest(











            @NonNull List<CredentialDescription> credentialDescriptions) {







            @NonNull Set<CredentialDescription> credentialDescriptions) {











        mCredentialDescriptions = new ArrayList<>(requireNonNull(credentialDescriptions));







        mCredentialDescriptions = new ArrayList<>(requireNonNull(credentialDescriptions));











    }







    }






























@@ -84,7 +86,7 @@ public final class UnregisterCredentialDescriptionRequest implements Parcelable









    }







    }































    @NonNull







    @NonNull











    public List<CredentialDescription> getCredentialDescriptions() {







    public Set<CredentialDescription> getCredentialDescriptions() {











        return mCredentialDescriptions;







        return new HashSet<>(mCredentialDescriptions);











    }







    }











}






}