commit cd7c72373c7aa804909c67c92b45c58a456e98a4
author Jonathan Pierce <jonathanpie@google.com> Fri Dec 16 01:33:18 2022 +0000
committer Jonathan Pierce <jonathanpie@google.com> Thu Dec 22 21:44:45 2022 +0000
tree ac4163c43a86a7fa8229c03e023977f148aaff29
parent 243f66dc01eabd90ecd39f9c913c203f9bfa430a

Include user consent in GetMeasurementApiStatus for better enablement signal for ad
techs.

Bug: 263513464

Test: atest
Change-Id: I000d8063111a8fa082617eb9d17667dbafc3e3bd

adservices/service-core/java/com/android/adservices/service/measurement/MeasurementServiceImpl.java

diff --git a/adservices/service-core/java/com/android/adservices/service/measurement/MeasurementServiceImpl.java b/adservices/service-core/java/com/android/adservices/service/measurement/MeasurementServiceImpl.java
index 75cd7c5..1e57509 100644
--- a/adservices/service-core/java/com/android/adservices/service/measurement/MeasurementServiceImpl.java
+++ b/adservices/service-core/java/com/android/adservices/service/measurement/MeasurementServiceImpl.java
@@ -406,6 +406,7 @@
                                 List.of(
                                         new KillSwitchAccessResolver(
                                                 mFlags::getMeasurementApiStatusKillSwitch),
+                                        new UserConsentAccessResolver(mConsentManager),
                                         new ForegroundEnforcementAccessResolver(
                                                 apiNameId,
                                                 callerUid,

adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/MeasurementServiceImplTest.java

diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/MeasurementServiceImplTest.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/MeasurementServiceImplTest.java
index 8f2cfea..a4a6d45 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/MeasurementServiceImplTest.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/MeasurementServiceImplTest.java
@@ -595,6 +595,14 @@
     }
 
     @Test
+    public void testGetMeasurementApiStatus_failureByConsentAccessResolver() throws Exception {
+        runRunMocks(
+                Api.STATUS,
+                new AccessDenier().deniedByConsent(),
+                this::getMeasurementApiStatusAndAssertFailure);
+    }
+
+    @Test
     public void testGetMeasurementApiStatus_invalidRequest_throwException() {
         assertThrows(
                 NullPointerException.class,
@@ -1328,6 +1336,9 @@
         // App Package Resolver Pp Api
         updateAppPackagePpApiResolverDenied(accessDenier.mByAppPackagePpApiApp);
 
+        // Consent Resolver
+        updateConsentDenied(accessDenier.mByConsent);
+
         // Results
         when(mMockMeasurementImpl.getMeasurementApiStatus())
                 .thenReturn(MeasurementManager.MEASUREMENT_API_STATE_ENABLED);