commit 20a2484e580ad3e312fe2fd84ce2a0662af78484
author Mathieu Chartier <mathieuc@google.com> Tue Feb 05 01:36:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 05 01:36:32 2019 +0000
tree 73cc114e59c755de59408549e399ffded7838d33
parent 30780a26f447f402075c4a3441b6c0a05a9ecfcd
parent b31138f908739b1dcde2d0ef112a1719ce9e5987

Merge "Add runtime_native_boot namespace"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 7bc2c81..4cb5eb0 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5770,6 +5770,10 @@
     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

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 92650e1..ed3026c 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -160,6 +160,17 @@
     }
 
     /**
+     * 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

diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index e731f34..ddbb421 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 @@
         DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_NETD_NATIVE,
+        DeviceConfig.RuntimeNativeBoot.NAMESPACE,
         DeviceConfig.RuntimeNative.NAMESPACE,
     };