summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2021-11-10 21:50:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-10 21:50:38 +0000
commit4babb3593555f8e0871d7f1a487966ee84e3fb46 (patch)
tree8fe57dc4ea27b1b3ab925444507afe4cfda51fab
parent068ea83b50715bb864a24af7c860f23575ef9bac (diff)
parentc153ab1a076edad9e2ff04179ac61ec6c0942d08 (diff)
Merge "Add virtualization_framework_native flag namespace" am: 5d72f2eaed am: 3169ea6042 am: f1a14ae3e2 am: c153ab1a07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873903 Change-Id: I2ba101bd25a1840bcdaae7ce397ff1cc472c127f
-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 71c4a72dc21d..2d402199e196 100644
--- a/core/java/android/provider/DeviceConfig.java
+++ b/core/java/android/provider/DeviceConfig.java
@@ -622,6 +622,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 eee21460dcb0..c5ac3907ecfe 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,
};