summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2021-11-10 22:09:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-10 22:09:29 +0000
commitb9d59dc46e235f93f81bb3105998cf28ea4772a1 (patch)
tree716facb652e83b7634cc4f5161101f525e3ee30f
parent5d39efecbd5a9e1e89e3a1232f119b7207dafe9a (diff)
parent4babb3593555f8e0871d7f1a487966ee84e3fb46 (diff)
Merge "Add virtualization_framework_native flag namespace" am: 5d72f2eaed am: 3169ea6042 am: f1a14ae3e2 am: c153ab1a07 am: 4babb35935
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873903 Change-Id: I73b53a85f37bb3e9ea0d13f4bbca4cd8f493353e
-rw-r--r--core/java/android/provider/DeviceConfig.java8
-rw-r--r--services/core/java/com/android/server/am/SettingsToPropertiesMapper.java1
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index dd31e027997f..21c1feba662e 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -648,6 +648,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.
*
* @hide
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index b5a9ee9adf77..c48ff9f9f2cc 100644
--- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
+++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
@@ -97,6 +97,7 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT,
DeviceConfig.NAMESPACE_SWCODEC_NATIVE,
DeviceConfig.NAMESPACE_TETHERING,
+ DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE,
DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,
};