Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" am: c4aedd1f87 am: 02709d5394

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471526

Change-Id: Ica83c944d645c9d1f23e5ba825e85491405bfc16
This commit is contained in:
Yi Kong
2020-11-03 01:41:59 +00:00
committed by Automerger Merge Worker
parent eac0392beb 02709d5394
commit d2b9bd8405
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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_PACKAGE_MANAGER_SERVICE = "package_manager_service";
field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PERMISSIONS = "permissions";
field public static final String NAMESPACE_PRIVACY = "privacy"; 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 = "rollback";
field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot";
field public static final String NAMESPACE_RUNTIME = "runtime"; field public static final String NAMESPACE_RUNTIME = "runtime";

1
core/api/system-current.txt
View File

@@ -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_PACKAGE_MANAGER_SERVICE = "package_manager_service";
field public static final String NAMESPACE_PERMISSIONS = "permissions"; field public static final String NAMESPACE_PERMISSIONS = "permissions";
field public static final String NAMESPACE_PRIVACY = "privacy"; 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 = "rollback";
field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot"; field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot";
field public static final String NAMESPACE_RUNTIME = "runtime"; field public static final String NAMESPACE_RUNTIME = "runtime";

9
core/java/android/provider/DeviceConfig.java
View File

@@ -217,6 +217,15 @@ public final class DeviceConfig {
@SystemApi @SystemApi
public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; 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. * Namespace for Rollback flags that are applied immediately.
* *

1
services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
View File

@@ -85,6 +85,7 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS, DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,
DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_MEDIA_NATIVE,
DeviceConfig.NAMESPACE_NETD_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE,
DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,
DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE,
DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,
DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT, DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,