No public description

PiperOrigin-RevId: 736543788
Change-Id: I8d84f316735fb27766fa176a05c105b70cd15826

Author: Privacy Sandbox Team

adservices_cli/adservices.py

@@ -30,7 +30,6 @@ class AdServices:
   """Privacy Sandbox for Android CLI (http://g.co/privacysandbox)."""
 
   _ADSERVICES_SYSTEM_PROPERTIES_NAMESPACE = "debug.adservices"
-  _ADSERVICES_DEVICE_CONFIG_NAMESPACE = "adservices"
   _ADSERVICES_PACKAGE = "com.google.android.adservices"
   _ADSERVICES_DOCS_URL = (
       "https://developer.android.com/design-for-safety/privacy-sandbox"
@@ -263,6 +262,11 @@ def _set_service_enabled(
     else:
       self._enable_feature(feature_name, flag_value)
 
+    if feature_name in flag_constants.FEATURES_WITH_DISABLED_JS_CACHING:
+      self._put_adservices_device_config(
+          flag_constants.ENABLE_HTTP_CACHE_JS_CACHING, kill_switch_value
+      )
+
     if feature_name == flag_constants.ON_DEVICE_AUCTION_V3:
       bidding_logic_js_version = "3" if enabled else "2"
       self._put_adservices_device_config(
@@ -293,12 +297,12 @@ def _get_ad_services_version(self) -> int:
 
   def _get_adservices_device_config(self, key: str, silent: bool = True) -> str:
     return self.adb.get_device_config(
-        self._ADSERVICES_DEVICE_CONFIG_NAMESPACE, key, silent
+        constants.ADSERVICES_DEVICE_CONFIG_NAMESPACE, key, silent
     )
 
   def _put_adservices_device_config(self, key: str, value: str):
     self.adb.put_device_config(
-        self._ADSERVICES_DEVICE_CONFIG_NAMESPACE, key, value, silent=False
+        constants.ADSERVICES_DEVICE_CONFIG_NAMESPACE, key, value, silent=False
     )
 
   def _get_adservices_sys_prop(self, key: str, silent: bool = True) -> str:

adservices_cli/adservices_test.py

@@ -0,0 +1,86 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from unittest import mock
+
+from absl.testing import absltest
+from absl.testing import parameterized
+
+import adb
+import adservices
+import constants
+import flag_constants
+
+
+class AdServicesTest(parameterized.TestCase):
+
+  def setUp(self):
+    super().setUp()
+    self.adb = mock.create_autospec(adb.AdbClient)
+    self.adservices = adservices.AdServices(self.adb)
+    self.adb.get_sdk_version.return_value = 33
+
+  @parameterized.named_parameters(
+      {
+          'testcase_name': 'all_enabled',
+          'feature_name': flag_constants.FEATURE_ALL,
+          'feature_enabled': True,
+          'js_cache_enabled': 'false',
+      },
+      {
+          'testcase_name': 'on_device_auction_enabled',
+          'feature_name': flag_constants.ON_DEVICE_AUCTION,
+          'feature_enabled': True,
+          'js_cache_enabled': 'false',
+      },
+      {
+          'testcase_name': 'on_device_auction_v3_enabled',
+          'feature_name': flag_constants.ON_DEVICE_AUCTION_V3,
+          'feature_enabled': True,
+          'js_cache_enabled': 'false',
+      },
+      {
+          'testcase_name': 'all_disabled',
+          'feature_name': flag_constants.FEATURE_ALL,
+          'feature_enabled': False,
+          'js_cache_enabled': 'true',
+      },
+      {
+          'testcase_name': 'on_device_auction_disabled',
+          'feature_name': flag_constants.ON_DEVICE_AUCTION,
+          'feature_enabled': False,
+          'js_cache_enabled': 'true',
+      },
+      {
+          'testcase_name': 'on_device_auction_v3_disabled',
+          'feature_name': flag_constants.ON_DEVICE_AUCTION_V3,
+          'feature_enabled': False,
+          'js_cache_enabled': 'true',
+      },
+  )
+  def test_set_service_enabled_sets_js_cache(
+      self, feature_name, feature_enabled, js_cache_enabled
+  ):
+    self.adservices._set_service_enabled(feature_enabled, feature_name)
+
+    self.adb.put_device_config.assert_any_call(
+        constants.ADSERVICES_DEVICE_CONFIG_NAMESPACE,
+        flag_constants.ENABLE_HTTP_CACHE_JS_CACHING,
+        js_cache_enabled,
+        silent=False,
+    )
+
+
+if __name__ == '__main__':
+  absltest.main()

adservices_cli/constants.py

@@ -15,3 +15,4 @@
 """Adservices common constants."""
 
 ADSERVICES_API_PACKAGE = "com.google.android.adservices.api"
+ADSERVICES_DEVICE_CONFIG_NAMESPACE = "adservices"

adservices_cli/flag_constants.py

@@ -49,6 +49,11 @@
     KANON,
     ON_DEVICE_AUCTION_V3,
 ]
+FEATURES_WITH_DISABLED_JS_CACHING = [
+    FEATURE_ALL,
+    ON_DEVICE_AUCTION,
+    ON_DEVICE_AUCTION_V3,
+]
 ## AdServices feature flags
 ### AdServices
 _ENABLE_ADSERVICES_SYSTEM_SERVICE = "adservice_system_service_enabled"
@@ -76,6 +81,7 @@
 
 ### On Device Auction
 AD_SELECTION_BIDDING_LOGIC_V3 = "fledge_ad_selection_bidding_logic_js_version"
+ENABLE_HTTP_CACHE_JS_CACHING = "fledge_http_cache_enable_js_caching"
 _ENABLE_AD_SELECTION_PREBUILT_URI = (
     "fledge_ad_selection_ad_selection_prebuilt_uri_enabled"
 )
@@ -86,13 +92,11 @@
     "fledge_event_level_debug_report_send_immediately"
 )
 _ENABLE_CONTEXTUAL_ADS_FILTER = "fledge_ad_selection_contextual_ads_enabled"
-_ENABLE_HTTP_CACHE_ENABLE_JS_CACHING = "fledge_http_cache_enable_js_caching"
 ENABLE_ALL_ON_DEVICE_AD_SELECTION_FLAGS = [
     _ENABLE_AD_SELECTION_PREBUILT_URI,
     _ENABLE_EVENT_LEVEL_DEBUG_REPORTING,
     _ENABLE_EVENT_LEVEL_DEBUG_REPORT_SEND_IMMEDIATELY,
     _ENABLE_CONTEXTUAL_ADS_FILTER,
-    _ENABLE_HTTP_CACHE_ENABLE_JS_CACHING,
 ]
 
 ### Server auctions