Snap for 9254005 from 7b99dc653ed133fef81d0423fee87d45299097e2 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000android13-mainline-ipsec-release

Change-Id: Id77860bb313cd5104abdea4a778d197a1db28861

1 files changed, 8 insertions, 5 deletions

diff --git a/adservices/service-core/java/com/android/adservices/service/measurement/access/ManifestBasedAdtechAccessResolver.java b/adservices/service-core/java/com/android/adservices/service/measurement/access/ManifestBasedAdtechAccessResolver.java
index 44d048f61d..9246a28961 100644
--- a/adservices/service-core/java/com/android/adservices/service/measurement/access/ManifestBasedAdtechAccessResolver.java
+++ b/adservices/service-core/java/com/android/adservices/service/measurement/access/ManifestBasedAdtechAccessResolver.java
@@ -63,13 +63,16 @@ public class ManifestBasedAdtechAccessResolver implements IAccessResolver {
         if (mUrl == null || TextUtils.isEmpty(mUrl.toString())) {
             return false;
         }
-        String uriWithoutParams = mUrl.buildUpon().clearQuery().fragment(null).build().toString();
+        Uri uriWithoutParams = mUrl.buildUpon().clearQuery().fragment(null).build();
         EnrollmentData enrollment =
                 mEnrollmentDao.getEnrollmentDataFromMeasurementUrl(uriWithoutParams);
-        boolean enrollmentKnown = (enrollment != null) && (enrollment.getEnrollmentId() != null);
-        return enrollmentKnown
-                && AppManifestConfigHelper.isAllowedAttributionAccess(
-                        context, mPackageName, enrollment.getEnrollmentId());
+        if (enrollment == null || enrollment.getEnrollmentId() == null) {
+            return false;
+        }
+        String enrollmentId = enrollment.getEnrollmentId();
+        return AppManifestConfigHelper.isAllowedAttributionAccess(
+                        context, mPackageName, enrollmentId)
+                && !mFlags.isEnrollmentBlocklisted(enrollmentId);
     }
 
     @NonNull