commit a2eeced7b789e98e202b440bd1b7d777685808a2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 22 04:36:25 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 22 04:36:25 2019 +0000
tree da220b44f6eca162bba23e16dca09f33188ca5ef
parent 4188aeb5d6fe26c6edb7f095446e70990aeac513
parent db279e8b396a4bab0f771b343a30c6e8a0a83246

Merge "Adding native flag namespace(netd)."

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index e593e14..8e6d4b0 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5265,6 +5265,7 @@
     field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
     field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
     field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
+    field public static final String NAMESPACE_NETD_NATIVE = "netd_native";
   }
 
   public static interface DeviceConfig.OnPropertyChangedListener {

core/java/android/provider/DeviceConfig.java

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 9015703..a7e6601 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -86,6 +86,14 @@
     @SystemApi
     public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
 
+    /**
+     * Namespace for all netd related features.
+     *
+     * @hide
+     */
+    @SystemApi
+    public static final String NAMESPACE_NETD_NATIVE = "netd_native";
+
     private static final Object sLock = new Object();
     @GuardedBy("sLock")
     private static Map<OnPropertyChangedListener, Pair<String, Executor>> sListeners =

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 c2117a7..128d98b 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -78,6 +78,7 @@
     @VisibleForTesting
     static final String[] sDeviceConfigScopes = new String[] {
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
+        DeviceConfig.NAMESPACE_NETD_NATIVE,
     };
 
     private final String[] mGlobalSettings;