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

Commit 351e096e authored by Helen Qin's avatar Helen Qin
Browse files

Renamed requireSystemProvider to isSystemProviderRequired. 

The new name follows the boolean getter property naming guideline.

Test: CtsCredentialProviderServiceDeviceTest
Bug: 265809824
Change-Id: I9136119a7ac5846d9cbb9dfdf05a07a3dd4679f8
parent c6e4ce08

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13316,7 +13316,7 @@ package android.credentials { 
    method @NonNull public android.os.Bundle getCandidateQueryData();

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

    method @NonNull public String getType();

    method public boolean requireSystemProvider();

    method public boolean isSystemProviderRequired();

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

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

  }
@@ -13363,7 +13363,7 @@ package android.credentials { 
    method @NonNull public android.os.Bundle getCandidateQueryData();

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

    method @NonNull public String getType();

    method public boolean requireSystemProvider();

    method public boolean isSystemProviderRequired();

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

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

  }

core/java/android/credentials/CreateCredentialRequest.java

+11 −10
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public final class CreateCredentialRequest implements Parcelable { 
    /**

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

     */

    private final boolean mRequireSystemProvider;

    private final boolean mIsSystemProviderRequired;



    /**

     * Returns the requested credential type.
@@ -99,8 +99,8 @@ public final class CreateCredentialRequest implements Parcelable { 
     * Returns true if the request must only be fulfilled by a system provider, and false

     * otherwise.

     */

    public boolean requireSystemProvider() {

        return mRequireSystemProvider;

    public boolean isSystemProviderRequired() {

        return mIsSystemProviderRequired;

    }



    @Override
@@ -108,7 +108,7 @@ public final class CreateCredentialRequest implements Parcelable { 
        dest.writeString8(mType);

        dest.writeBundle(mCredentialData);

        dest.writeBundle(mCandidateQueryData);

        dest.writeBoolean(mRequireSystemProvider);

        dest.writeBoolean(mIsSystemProviderRequired);

    }



    @Override
@@ -122,7 +122,7 @@ public final class CreateCredentialRequest implements Parcelable { 
                + "type=" + mType

                + ", credentialData=" + mCredentialData

                + ", candidateQueryData=" + mCandidateQueryData

                + ", requireSystemProvider=" + mRequireSystemProvider

                + ", isSystemProviderRequired=" + mIsSystemProviderRequired

                + "}";

    }
@@ -133,7 +133,8 @@ public final class CreateCredentialRequest implements Parcelable { 
     * @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

     * @param requireSystemProvider whether the request must only be fulfilled by a system provider

     * @param isSystemProviderRequired whether the request must only be fulfilled by a system

     *                                provider

     *

     * @throws IllegalArgumentException If type is empty.

     */
@@ -141,19 +142,19 @@ public final class CreateCredentialRequest implements Parcelable { 
            @NonNull String type,

            @NonNull Bundle credentialData,

            @NonNull Bundle candidateQueryData,

            boolean requireSystemProvider) {

            boolean isSystemProviderRequired) {

        mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");

        mCredentialData = requireNonNull(credentialData, "credentialData must not be null");

        mCandidateQueryData = requireNonNull(candidateQueryData,

                "candidateQueryData must not be null");

        mRequireSystemProvider = requireSystemProvider;

        mIsSystemProviderRequired = isSystemProviderRequired;

    }



    private CreateCredentialRequest(@NonNull Parcel in) {

        String type = in.readString8();

        Bundle credentialData = in.readBundle();

        Bundle candidateQueryData = in.readBundle();

        boolean requireSystemProvider = in.readBoolean();

        boolean isSystemProviderRequired = in.readBoolean();



        mType = type;

        AnnotationValidations.validate(NonNull.class, null, mType);
@@ -161,7 +162,7 @@ public final class CreateCredentialRequest implements Parcelable { 
        AnnotationValidations.validate(NonNull.class, null, mCredentialData);

        mCandidateQueryData = candidateQueryData;

        AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);

        mRequireSystemProvider = requireSystemProvider;

        mIsSystemProviderRequired = isSystemProviderRequired;

    }



    public static final @NonNull Parcelable.Creator<CreateCredentialRequest> CREATOR =

core/java/android/credentials/GetCredentialOption.java

+10 −10
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public final class GetCredentialOption implements Parcelable { 
    /**

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

     */

    private final boolean mRequireSystemProvider;

    private final boolean mIsSystemProviderRequired;



    /**

     * Returns the requested credential type.
@@ -91,8 +91,8 @@ public final class GetCredentialOption implements Parcelable { 
     * Returns true if the request must only be fulfilled by a system provider, and false

     * otherwise.

     */

    public boolean requireSystemProvider() {

        return mRequireSystemProvider;

    public boolean isSystemProviderRequired() {

        return mIsSystemProviderRequired;

    }



    @Override
@@ -100,7 +100,7 @@ public final class GetCredentialOption implements Parcelable { 
        dest.writeString8(mType);

        dest.writeBundle(mCredentialRetrievalData);

        dest.writeBundle(mCandidateQueryData);

        dest.writeBoolean(mRequireSystemProvider);

        dest.writeBoolean(mIsSystemProviderRequired);

    }



    @Override
@@ -114,7 +114,7 @@ public final class GetCredentialOption implements Parcelable { 
                + "type=" + mType

                + ", requestData=" + mCredentialRetrievalData

                + ", candidateQueryData=" + mCandidateQueryData

                + ", requireSystemProvider=" + mRequireSystemProvider

                + ", isSystemProviderRequired=" + mIsSystemProviderRequired

                + "}";

    }
@@ -125,7 +125,7 @@ public final class GetCredentialOption implements Parcelable { 
     * @param credentialRetrievalData the request data

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

     *                                during the initial credential candidate query stage

     * @param requireSystemProvider   whether the request must only be fulfilled by a system

     * @param isSystemProviderRequired   whether the request must only be fulfilled by a system

     *                                provider

     * @throws IllegalArgumentException If type is empty.

     */
@@ -133,20 +133,20 @@ public final class GetCredentialOption implements Parcelable { 
            @NonNull String type,

            @NonNull Bundle credentialRetrievalData,

            @NonNull Bundle candidateQueryData,

            boolean requireSystemProvider) {

            boolean isSystemProviderRequired) {

        mType = Preconditions.checkStringNotEmpty(type, "type must not be empty");

        mCredentialRetrievalData = requireNonNull(credentialRetrievalData,

                "requestData must not be null");

        mCandidateQueryData = requireNonNull(candidateQueryData,

                "candidateQueryData must not be null");

        mRequireSystemProvider = requireSystemProvider;

        mIsSystemProviderRequired = isSystemProviderRequired;

    }



    private GetCredentialOption(@NonNull Parcel in) {

        String type = in.readString8();

        Bundle data = in.readBundle();

        Bundle candidateQueryData = in.readBundle();

        boolean requireSystemProvider = in.readBoolean();

        boolean isSystemProviderRequired = in.readBoolean();



        mType = type;

        AnnotationValidations.validate(NonNull.class, null, mType);
@@ -154,7 +154,7 @@ public final class GetCredentialOption implements Parcelable { 
        AnnotationValidations.validate(NonNull.class, null, mCredentialRetrievalData);

        mCandidateQueryData = candidateQueryData;

        AnnotationValidations.validate(NonNull.class, null, mCandidateQueryData);

        mRequireSystemProvider = requireSystemProvider;

        mIsSystemProviderRequired = isSystemProviderRequired;

    }



    public static final @NonNull Parcelable.Creator<GetCredentialOption> CREATOR =

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

+4 −4
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ class CredentialManagerRepo( 
        credentialData,

        // TODO: populate with actual data

        /*candidateQueryData=*/ Bundle(),

        /*requireSystemProvider=*/ false

        /*isSystemProviderRequired=*/ false

      ),

      "com.google.android.youtube"

    )
@@ -429,7 +429,7 @@ class CredentialManagerRepo( 
        data,

        // TODO: populate with actual data

        /*candidateQueryData=*/ Bundle(),

        /*requireSystemProvider=*/ false

        /*isSystemProviderRequired=*/ false

      ),

      "com.google.android.youtube"

    )
@@ -443,7 +443,7 @@ class CredentialManagerRepo( 
        "other-sign-ins",

        data,

        /*candidateQueryData=*/ Bundle(),

        /*requireSystemProvider=*/ false

        /*isSystemProviderRequired=*/ false

      ),

      "com.google.android.youtube"

    )
@@ -457,7 +457,7 @@ class CredentialManagerRepo( 
      )

        .addGetCredentialOption(

          GetCredentialOption(

            TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /*requireSystemProvider=*/ false)

            TYPE_PUBLIC_KEY_CREDENTIAL, Bundle(), Bundle(), /*isSystemProviderRequired=*/ false)

        )

        .build(),

      "com.google.android.youtube"

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ class CreateFlowUtils { 
      val createCredentialRequest = requestInfo.createCredentialRequest

      val createCredentialRequestJetpack = createCredentialRequest?.let {

        CreateCredentialRequest.createFrom(

                it.type, it.credentialData, it.candidateQueryData, it.requireSystemProvider()

                it.type, it.credentialData, it.candidateQueryData, it.isSystemProviderRequired()

        )

      }

      when (createCredentialRequestJetpack) {