diff options
| author | Yi Kong <yikong@google.com> | 2020-11-03 00:37:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-03 00:37:13 +0000 |
| commit | c4aedd1f874dbd8eb13bace4c303978d09354d78 (patch) | |
| tree | 57369bab95ab559af1c6b94676a63d7f8dbafcf7 | |
| parent | 75ec2dae7df32494bbd91737e4fb24d1773738d5 (diff) | |
| parent | 878268ceaba2e36c34aa3081a504382c5efa06c4 (diff) | |
Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments"
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/DeviceConfig.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 85d7930cf43c..5ea8e438d064 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 25f72bd49f2c..7db113db8e7e 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 000cb2acbb60..4d67d4623897 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -218,6 +218,15 @@ public final class DeviceConfig { 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. * * @hide diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 60e59e389cf0..28afcbbb2a86 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, |