diff options
| -rw-r--r-- | core/java/android/credentials/CredentialManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/service/autofill/Dataset.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/autofill/AutofillManager.java | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/credentials/CredentialManager.java b/core/java/android/credentials/CredentialManager.java index 20771af7d26d..524afe975d73 100644 --- a/core/java/android/credentials/CredentialManager.java +++ b/core/java/android/credentials/CredentialManager.java @@ -153,7 +153,7 @@ public final class CredentialManager { mService.getCandidateCredentials( request, new GetCandidateCredentialsTransport(executor, callback), - mContext.getOpPackageName()); + callingPackage); } catch (RemoteException e) { e.rethrowFromSystemServer(); } diff --git a/core/java/android/service/autofill/Dataset.java b/core/java/android/service/autofill/Dataset.java index a29bf7a06334..1afe8d95185b 100644 --- a/core/java/android/service/autofill/Dataset.java +++ b/core/java/android/service/autofill/Dataset.java @@ -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; diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 34e4c37de1b5..4bc7f285269b 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -3474,7 +3474,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; } } |