diff options
Diffstat (limited to 'adservices/service-core/java/com/android/adservices/service/PhFlags.java')
| -rw-r--r-- | adservices/service-core/java/com/android/adservices/service/PhFlags.java | 155 |
1 files changed, 6 insertions, 149 deletions
diff --git a/adservices/service-core/java/com/android/adservices/service/PhFlags.java b/adservices/service-core/java/com/android/adservices/service/PhFlags.java index e1a8b26790..e221e027d7 100644 --- a/adservices/service-core/java/com/android/adservices/service/PhFlags.java +++ b/adservices/service-core/java/com/android/adservices/service/PhFlags.java @@ -3481,16 +3481,6 @@ public final class PhFlags extends CommonPhFlags implements Flags { } @Override - public boolean getMeasurementEnableConfigurableEventReportingWindows() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getBoolean( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_ENABLE_CONFIGURABLE_EVENT_REPORTING_WINDOWS, - /* defaultValue */ MEASUREMENT_ENABLE_CONFIGURABLE_EVENT_REPORTING_WINDOWS); - } - - @Override public String getMeasurementEventReportsVtcEarlyReportingWindows() { // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. return DeviceConfig.getString( @@ -4298,49 +4288,6 @@ public final class PhFlags extends CommonPhFlags implements Flags { + getMeasurementMinReportingOriginUpdateWindow()); writer.println( "\t" - + FlagsConstants - .KEY_MEASUREMENT_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY - + " = " - + getMeasurementDualDestinationNavigationNoiseProbability()); - writer.println( - "\t" - + FlagsConstants - .KEY_MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY - + " = " - + getMeasurementInstallAttrDualDestinationEventNoiseProbability()); - writer.println( - "\t" - + FlagsConstants - .KEY_MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY - + " = " - + getMeasurementInstallAttrDualDestinationNavigationNoiseProbability()); - writer.println( - "\t" - + FlagsConstants.KEY_MEASUREMENT_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY - + " = " - + getMeasurementDualDestinationEventNoiseProbability()); - writer.println( - "\t" - + FlagsConstants.KEY_MEASUREMENT_INSTALL_ATTR_EVENT_NOISE_PROBABILITY - + " = " - + getMeasurementInstallAttrEventNoiseProbability()); - writer.println( - "\t" - + FlagsConstants.KEY_MEASUREMENT_INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY - + " = " - + getMeasurementInstallAttrNavigationNoiseProbability()); - writer.println( - "\t" - + FlagsConstants.KEY_MEASUREMENT_EVENT_NOISE_PROBABILITY - + " = " - + getMeasurementEventNoiseProbability()); - writer.println( - "\t" - + FlagsConstants.KEY_MEASUREMENT_NAVIGATION_NOISE_PROBABILITY - + " = " - + getMeasurementNavigationNoiseProbability()); - writer.println( - "\t" + FlagsConstants.KEY_MEASUREMENT_REGISTRATION_JOB_QUEUE_KILL_SWITCH + " = " + getAsyncRegistrationJobQueueKillSwitch()); @@ -4386,11 +4333,6 @@ public final class PhFlags extends CommonPhFlags implements Flags { + getMeasurementMinEventReportDelayMillis()); writer.println( "\t" - + FlagsConstants.KEY_MEASUREMENT_ENABLE_CONFIGURABLE_EVENT_REPORTING_WINDOWS - + " = " - + getMeasurementEnableConfigurableEventReportingWindows()); - writer.println( - "\t" + FlagsConstants.KEY_MEASUREMENT_EVENT_REPORTS_VTC_EARLY_REPORTING_WINDOWS + " = " + getMeasurementEventReportsVtcEarlyReportingWindows()); @@ -5705,12 +5647,12 @@ public final class PhFlags extends CommonPhFlags implements Flags { } @Override - public boolean getEnableRvcNotification() { + public boolean getEnableRvcPostOtaNotification() { return getEnableAdServicesSystemApi() && DeviceConfig.getBoolean( FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants.KEY_RVC_NOTIFICATION_ENABLED, - /* defaultValue */ DEFAULT_RVC_NOTIFICATION_ENABLED); + /* flagName */ FlagsConstants.KEY_RVC_POST_OTA_NOTIFICATION_ENABLED, + /* defaultValue */ DEFAULT_RVC_POST_OTA_NOTIFICATION_ENABLED); } @Override @@ -5733,7 +5675,9 @@ public final class PhFlags extends CommonPhFlags implements Flags { getRecordManualInteractionEnabled()); uxMap.put(FlagsConstants.KEY_GA_UX_FEATURE_ENABLED, getGaUxFeatureEnabled()); uxMap.put(FlagsConstants.KEY_RVC_UX_ENABLED, getEnableRvcUx()); - uxMap.put(FlagsConstants.KEY_RVC_NOTIFICATION_ENABLED, getEnableRvcNotification()); + uxMap.put( + FlagsConstants.KEY_RVC_POST_OTA_NOTIFICATION_ENABLED, + getEnableRvcPostOtaNotification()); uxMap.put( FlagsConstants.KEY_UI_OTA_STRINGS_FEATURE_ENABLED, getUiOtaStringsFeatureEnabled()); uxMap.put( @@ -5866,83 +5810,6 @@ public final class PhFlags extends CommonPhFlags implements Flags { } @Override - public float getMeasurementInstallAttrDualDestinationEventNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementDualDestinationNavigationNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementInstallAttrDualDestinationNavigationNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_INSTALL_ATTR_DUAL_DESTINATION_NAVIGATION_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementDualDestinationEventNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_DUAL_DESTINATION_EVENT_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementInstallAttrEventNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants.KEY_MEASUREMENT_INSTALL_ATTR_EVENT_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_INSTALL_ATTR_EVENT_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementInstallAttrNavigationNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_INSTALL_ATTR_NAVIGATION_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementEventNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants.KEY_MEASUREMENT_EVENT_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_EVENT_NOISE_PROBABILITY); - } - - @Override - public float getMeasurementNavigationNoiseProbability() { - // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. - return DeviceConfig.getFloat( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants.KEY_MEASUREMENT_NAVIGATION_NOISE_PROBABILITY, - /* defaultValue */ MEASUREMENT_NAVIGATION_NOISE_PROBABILITY); - } - - @Override public boolean getMeasurementEnablePreinstallCheck() { // The priority of applying the flag values: PH (DeviceConfig) and then hard-coded value. return DeviceConfig.getBoolean( @@ -5952,16 +5819,6 @@ public final class PhFlags extends CommonPhFlags implements Flags { } @Override - public boolean getMeasurementEnableVtcConfigurableMaxEventReports() { - return DeviceConfig.getBoolean( - FlagsConstants.NAMESPACE_ADSERVICES, - /* flagName */ FlagsConstants - .KEY_MEASUREMENT_ENABLE_VTC_CONFIGURABLE_MAX_EVENT_REPORTS, - /* defaultValue */ - DEFAULT_MEASUREMENT_ENABLE_VTC_CONFIGURABLE_MAX_EVENT_REPORTS); - } - - @Override public int getMeasurementVtcConfigurableMaxEventReportsCount() { return DeviceConfig.getInt( FlagsConstants.NAMESPACE_ADSERVICES, |