From 878268ceaba2e36c34aa3081a504382c5efa06c4 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Sat, 24 Oct 2020 01:46:14 +0800 Subject: [PATCH] Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments Bug: 79161490 Test: build Change-Id: Icf8c24f6d5b63a28272e383e5ab0641032710cdd --- api/system-current.txt | 1 + core/api/system-current.txt | 1 + core/java/android/provider/DeviceConfig.java | 9 +++++++++ .../android/server/am/SettingsToPropertiesMapper.java | 1 + 4 files changed, 12 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index 0104ca25795c4..19badda56eead 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8992,6 +8992,7 @@ package android.provider { field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; + field public static final String NAMESPACE_PROFCOLLECT_NATIVE_BOOT = "profcollect_native_boot"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; field public static final String NAMESPACE_RUNTIME = "runtime"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 95fc15254cd4c..86afd40d95e4b 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -7883,6 +7883,7 @@ package android.provider { field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PRIVACY = "privacy"; + field public static final String NAMESPACE_PROFCOLLECT_NATIVE_BOOT = "profcollect_native_boot"; field public static final String NAMESPACE_ROLLBACK = "rollback"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; field public static final String NAMESPACE_RUNTIME = "runtime"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 000cb2acbb60c..4d67d4623897c 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -217,6 +217,15 @@ public final class DeviceConfig { @SystemApi public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; + /** + * Namespace for features related to the Profcollect native Service. + * These features are applied at reboot. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_PROFCOLLECT_NATIVE_BOOT = "profcollect_native_boot"; + /** * Namespace for Rollback flags that are applied immediately. * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 60e59e389cf09..28afcbbb2a868 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -85,6 +85,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS, DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE, + DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,