Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2b9bd84 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature... 

Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" am: c4aedd1f am: 02709d53

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

Change-Id: Ica83c944d645c9d1f23e5ba825e85491405bfc16
parents eac0392b 02709d53

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/DeviceConfig.java

+9 −0
Original line number Diff line number Diff line
@@ -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.

     *

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -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,