Merge "Add runtime_native_boot namespace"

api/system-current.txt

@@ -5770,6 +5770,10 @@ package android.provider {
     field public static final String NAMESPACE = "runtime_native";
   }
 
+  public static interface DeviceConfig.RuntimeNativeBoot {
+    field public static final String NAMESPACE = "runtime_native_boot";
+  }
+
   public static interface DeviceConfig.Storage {
     field public static final String ISOLATED_STORAGE_ENABLED = "isolated_storage_enabled";
     field public static final String NAMESPACE = "storage";

core/java/android/provider/DeviceConfig.java

@@ -159,6 +159,17 @@ public final class DeviceConfig {
         String NAMESPACE = "runtime_native";
     }
 
+    /**
+     * Namespace for all runtime native boot related features. Boot in this case refers to the
+     * fact that the properties only take affect after rebooting the device.
+     *
+     * @hide
+     */
+    @SystemApi
+    public interface RuntimeNativeBoot {
+        String NAMESPACE = "runtime_native_boot";
+    }
+
     /**
      * Namespace for all activity manager related features that are used at the native level.
      * These features are applied at reboot.

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

@@ -80,6 +80,7 @@ class SettingsToPropertiesMapper {
         DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_NETD_NATIVE,
+        DeviceConfig.RuntimeNativeBoot.NAMESPACE,
         DeviceConfig.RuntimeNative.NAMESPACE,
     };