Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 8 deletions

diff --git a/dom/webauthn/AndroidWebAuthnService.cpp b/dom/webauthn/AndroidWebAuthnService.cpp
index 162cc52033..a4fa230455 100644
--- a/dom/webauthn/AndroidWebAuthnService.cpp
+++ b/dom/webauthn/AndroidWebAuthnService.cpp
@@ -186,12 +186,6 @@ AndroidWebAuthnService::MakeCredential(uint64_t aTransactionId,
                 GetCurrentSerialEventTarget(), __func__,
                 [aPromise, credPropsResponse = std::move(credPropsResponse)](
                     RefPtr<WebAuthnRegisterResult>&& aValue) {
-                  // We don't have a way for the user to consent to attestation
-                  // on Android, so always anonymize the result.
-                  nsresult rv = aValue->Anonymize();
-                  if (NS_FAILED(rv)) {
-                    aPromise->Reject(NS_ERROR_DOM_NOT_ALLOWED_ERR);
-                  }
                   if (credPropsResponse.isSome()) {
                     Unused << aValue->SetCredPropsRk(credPropsResponse.ref());
                   }
@@ -357,8 +351,8 @@ AndroidWebAuthnService::PinCallback(uint64_t aTransactionId,
 }
 
 NS_IMETHODIMP
-AndroidWebAuthnService::ResumeMakeCredential(uint64_t aTransactionId,
-                                             bool aForceNoneAttestation) {
+AndroidWebAuthnService::SetHasAttestationConsent(uint64_t aTransactionId,
+                                                 bool aHasConsent) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }