From b31138f908739b1dcde2d0ef112a1719ce9e5987 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 1 Feb 2019 16:51:12 -0800
Subject: [PATCH] Add runtime_native_boot namespace

For runtime properties that require reboots.

Bug: 120794191
Bug: 123524494
Test: set a property and ensure it can be read in AndroidRuntime.cpp

Change-Id: I6287320465f633447a7ef65af6c29cd9f8cce18d
---
 api/system-current.txt                                |  4 ++++
 core/java/android/provider/DeviceConfig.java          | 11 +++++++++++
 .../android/server/am/SettingsToPropertiesMapper.java |  1 +
 3 files changed, 16 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 0d8b729354b98..45d5f6325827c 100644
--- a/api/system-current.txt
+++ b/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";
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 92650e114a660..ed3026c038107 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/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.
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index e731f345b7048..ddbb421c7f0a2 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/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,
     };