From a949936fbdff6286aa0458027ddc00e4011957db Mon Sep 17 00:00:00 2001
From: Andrew Scull <ascull@google.com>
Date: Fri, 29 Oct 2021 14:47:35 +0100
Subject: [PATCH] Add virtualization_framework_native flag namespace

Bug: 192819132
Test: n/a
Change-Id: Ie604a6a9f0c980a43f8470869f8c5619be40ecfc
---
 core/java/android/provider/DeviceConfig.java              | 8 ++++++++
 .../com/android/server/am/SettingsToPropertiesMapper.java | 1 +
 2 files changed, 9 insertions(+)

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 8ac5c03977343..6644f1e91f1db 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -621,6 +621,14 @@ public final class DeviceConfig {
      */
     public static final String NAMESPACE_GAME_OVERLAY = "game_overlay";
 
+    /**
+     * Namespace for Android Virtualization Framework related features accessible by native code.
+     *
+     * @hide
+     */
+    public static final String NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE =
+            "virtualization_framework_native";
+
     /**
      * Namespace for Constrain Display APIs related features.
      *
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index eee21460dcb02..c5ac3907ecfe9 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -95,6 +95,7 @@ public class SettingsToPropertiesMapper {
         DeviceConfig.NAMESPACE_STATSD_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
         DeviceConfig.NAMESPACE_TETHERING,
+        DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,
         DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,
     };