From 5ebb265fb6f25f78ba0774a81c9b088fdc9bb81c Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Wed, 30 Jan 2019 15:26:46 -0800
Subject: [PATCH] Add media_native flag namespace

Test: add sepolicy, build, check GetServerConfigurableFlag function in
      media apex.
Bug: 123658514
Change-Id: Ic22561742c969d79f6aba8d2043501492cc30228
---
 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 a9ef144313a83..e398134127746 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5750,6 +5750,10 @@ package android.provider {
     field public static final String NAMESPACE = "intelligence_attention";
   }
 
+  public static interface DeviceConfig.MediaNative {
+    field public static final String NAMESPACE = "media_native";
+  }
+
   public static interface DeviceConfig.NotificationAssistant {
     field public static final String GENERATE_ACTIONS = "generate_actions";
     field public static final String GENERATE_REPLIES = "generate_replies";
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index ed3026c038107..baf0a0bc09c8b 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -170,6 +170,16 @@ public final class DeviceConfig {
         String NAMESPACE = "runtime_native_boot";
     }
 
+    /**
+     * Namespace for all media native related features.
+     *
+     * @hide
+     */
+    @SystemApi
+    public interface MediaNative {
+        String NAMESPACE = "media_native";
+    }
+
     /**
      * 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 ddbb421c7f0a2..cbbbe47431084 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 @@ class SettingsToPropertiesMapper {
     @VisibleForTesting
     static final String[] sDeviceConfigScopes = new String[] {
         DeviceConfig.ActivityManagerNativeBoot.NAMESPACE,
+        DeviceConfig.MediaNative.NAMESPACE,
         DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_NETD_NATIVE,
         DeviceConfig.RuntimeNativeBoot.NAMESPACE,