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

Commit b7c89a1b authored by Reema Bajwa's avatar Reema Bajwa Committed by Android (Google) Code Review
Browse files

Merge "Minor fixes for autofill-credman integration" into main

parents ab6b2d92 45dc1344

core/java/android/credentials/CredentialManager.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class CredentialManager { 
                    mService.getCandidateCredentials(

                            request,

                            new GetCandidateCredentialsTransport(executor, callback),

                            mContext.getOpPackageName());

                            callingPackage);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

core/java/android/service/autofill/Dataset.java

+3 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ public final class Dataset implements Parcelable { 
        parcel.writeParcelable(mAuthentication, flags);

        parcel.writeString(mId);

        parcel.writeInt(mEligibleReason);

        parcel.writeTypedObject(mAuthenticationExtras, flags);

    }



    public static final @NonNull Creator<Dataset> CREATOR = new Creator<Dataset>() {
@@ -1436,6 +1437,7 @@ public final class Dataset implements Parcelable { 
                    android.content.IntentSender.class);

            final String datasetId = parcel.readString();

            final int eligibleReason = parcel.readInt();

            final Bundle authenticationExtras = parcel.readTypedObject(Bundle.CREATOR);



            // Always go through the builder to ensure the data ingested by

            // the system obeys the contract of the builder to avoid attacks
@@ -1480,6 +1482,7 @@ public final class Dataset implements Parcelable { 
                        fieldDialogPresentation);

            }

            builder.setAuthentication(authentication);

            builder.setAuthenticationExtras(authenticationExtras);

            builder.setId(datasetId);

            Dataset dataset = builder.build();

            dataset.mEligibleReason = eligibleReason;

core/java/android/view/autofill/AutofillManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3392,7 +3392,7 @@ public final class AutofillManager { 
            return false;

        }

        for (String hint : hints) {

            if (Objects.equals(hint, View.AUTOFILL_HINT_CREDENTIAL_MANAGER)) {

            if (hint != null && hint.startsWith(View.AUTOFILL_HINT_CREDENTIAL_MANAGER)) {

                return true;

            }

        }