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

Commit ef3d90f7 authored by Vikram Gaur's avatar Vikram Gaur Committed by Automerger Merge Worker
Browse files

Merge "Add Remote Key Provisioning Daemon native namespace for feature flags." am: c11d99f0 

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



Change-Id: I28360d873009fe09ac51eb1e53e47e8e8285810a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3472b9e c11d99f0

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -376,6 +376,14 @@ public final class DeviceConfig { 
    @SystemApi

    public static final String NAMESPACE_REBOOT_READINESS = "reboot_readiness";



    /**

     * Namespace for Remote Key Provisioning related features.

     *

     * @hide

     */

    public static final String NAMESPACE_REMOTE_KEY_PROVISIONING_NATIVE =

            "remote_key_provisioning_native";



    /**

     * 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
@@ -90,6 +90,7 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_NETD_NATIVE,

        DeviceConfig.NAMESPACE_NNAPI_NATIVE,

        DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_REMOTE_KEY_PROVISIONING_NATIVE,

        DeviceConfig.NAMESPACE_RUNTIME_NATIVE,

        DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_STATSD_NATIVE,