From 7f11eb9057447cfa36c951355a99f87eeb0cf1b0 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 25 Jan 2019 16:08:21 -0800
Subject: [PATCH] Add runtime_native namespace for properties

Create a namespace for runtime native properties, java language
properties will be added in a later CL.

Bug: 111397239
Bug: 120794191
Bug: 123524494

Test: adb shell device_config put runtime_native gctype CC,preverify
Test: verify the property is set correctly
Exempt-From-Owner-Approval: Previously approved

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

diff --git a/api/system-current.txt b/api/system-current.txt
index a4203497d88cc..7a8ddab95f07e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5836,6 +5836,10 @@ package android.provider {
     field public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "enable_permissions_hub";
   }
 
+  public static interface DeviceConfig.RuntimeNative {
+    field public static final String NAMESPACE = "runtime_native";
+  }
+
   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 264f97568b50a..0b23fe3e9168a 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -149,6 +149,16 @@ public final class DeviceConfig {
         String GENERATE_ACTIONS = "generate_actions";
     }
 
+    /**
+     * Namespace for all runtime native related features.
+     *
+     * @hide
+     */
+    @SystemApi
+    public interface RuntimeNative {
+        String NAMESPACE = "runtime_native";
+    }
+
     /**
      * Namespace for attention-based features provided by on-device machine intelligence.
      *
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index 128d98bcc738a..5c6090030f744 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -79,6 +79,7 @@ class SettingsToPropertiesMapper {
     static final String[] sDeviceConfigScopes = new String[] {
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_NETD_NATIVE,
+        DeviceConfig.RuntimeNative.NAMESPACE,
     };
 
     private final String[] mGlobalSettings;