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

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

Merge "Add type to builder constructor as it is required" into udc-dev am: fe9247c2 

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



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

core/api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -13594,12 +13594,11 @@ package android.credentials { 
  }















  public static final class CreateCredentialRequest.Builder {













    ctor public CreateCredentialRequest.Builder(@NonNull android.os.Bundle, @NonNull android.os.Bundle);













    ctor public CreateCredentialRequest.Builder(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.Bundle);















    method @NonNull public android.credentials.CreateCredentialRequest build();















    method @NonNull public android.credentials.CreateCredentialRequest.Builder setAlwaysSendAppInfoToProvider(boolean);















    method @NonNull public android.credentials.CreateCredentialRequest.Builder setIsSystemProviderRequired(boolean);















    method @NonNull @RequiresPermission(android.Manifest.permission.CREDENTIAL_MANAGER_SET_ORIGIN) public android.credentials.CreateCredentialRequest.Builder setOrigin(@NonNull String);













    method @NonNull public android.credentials.CreateCredentialRequest.Builder setType(@NonNull String);















  }





























  public final class CreateCredentialResponse implements android.os.Parcelable {

























core/java/android/credentials/CreateCredentialRequest.java



+7
−11




























Original line number
Diff line number
Diff line








@@ -260,11 +260,17 @@ public final class CreateCredentialRequest implements Parcelable {













        private String mOrigin;































        /**













         * @param type the type of the credential to be stored















         * @param credentialData the full credential creation request data















         * @param candidateQueryData the partial request data that will be sent to the provider















         *                           during the initial creation candidate query stage















         */













        public Builder(@NonNull Bundle credentialData, @NonNull Bundle candidateQueryData) {













        public Builder(













                @NonNull String type,













                @NonNull Bundle credentialData,













                @NonNull Bundle candidateQueryData) {













            mType = Preconditions.checkStringNotEmpty(type,













                    "type must not be null or empty");















            mCredentialData = requireNonNull(credentialData,















                    "credentialData must not be null");















            mCandidateQueryData = requireNonNull(candidateQueryData,









@@ -290,16 +296,6 @@ public final class CreateCredentialRequest implements Parcelable {













            return this;















        }





























        /**













         * Sets the requested credential type.













         */













        @SuppressLint("MissingGetterMatchingBuilder")













        @NonNull













        public CreateCredentialRequest.Builder setType(@NonNull String type) {













            mType = type;













            return this;













        }





























        /**















         * Sets whether the request must only be fulfilled by a system provider.















         * This defaults to false

































core/tests/coretests/src/android/credentials/CredentialManagerTest.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -101,8 +101,9 @@ public class CredentialManagerTest {













        mGetRequest = new GetCredentialRequest.Builder(Bundle.EMPTY).addCredentialOption(















                new CredentialOption(Credential.TYPE_PASSWORD_CREDENTIAL, Bundle.EMPTY,















                        Bundle.EMPTY, false)).build();













        mCreateRequest = new CreateCredentialRequest.Builder(Bundle.EMPTY, Bundle.EMPTY)













                .setType(Credential.TYPE_PASSWORD_CREDENTIAL)













        mCreateRequest = new CreateCredentialRequest.Builder(













                Credential.TYPE_PASSWORD_CREDENTIAL,













                Bundle.EMPTY, Bundle.EMPTY)















                .setIsSystemProviderRequired(false)















                .setAlwaysSendAppInfoToProvider(false)















                .build();

































packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt



+5
−6




























Original line number
Diff line number
Diff line








@@ -407,8 +407,8 @@ class CredentialManagerRepo(













        val credentialData = request.credentialData















        return RequestInfo.newCreateRequestInfo(















                Binder(),













                CreateCredentialRequest.Builder(credentialData, Bundle())













                        .setType("androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL")













                CreateCredentialRequest.Builder("androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL",













                credentialData, Bundle())















                        .setIsSystemProviderRequired(false)















                        .setAlwaysSendAppInfoToProvider(true)















                        .build(),









@@ -420,8 +420,8 @@ class CredentialManagerRepo(













        val request = CreatePasswordRequest("beckett-bakert@gmail.com", "password123")















        return RequestInfo.newCreateRequestInfo(















                Binder(),













                CreateCredentialRequest.Builder(request.credentialData, request.candidateQueryData)













                        .setType(TYPE_PASSWORD_CREDENTIAL)













                CreateCredentialRequest.Builder(TYPE_PASSWORD_CREDENTIAL,













                request.credentialData, request.candidateQueryData)















                        .setIsSystemProviderRequired(false)















                        .setAlwaysSendAppInfoToProvider(true)















                        .build(),









@@ -438,8 +438,7 @@ class CredentialManagerRepo(













        )















        return RequestInfo.newCreateRequestInfo(















                Binder(),













                CreateCredentialRequest.Builder(data, Bundle())













                        .setType("other-sign-ins")













                CreateCredentialRequest.Builder("other-sign-ins", data, Bundle())















                        .setIsSystemProviderRequired(false)















                        .setAlwaysSendAppInfoToProvider(true)















                        .build(),