From 8ef59a139e8eefa2ca7d6e4484315604f5754e0d Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 12 Aug 2022 17:27:07 +0000 Subject: [PATCH] Add DeviceConfig namespace for Vendor System Native Boot To avoid conflicts, merge master first then cherrypick to tm-qpr-dev. Bug: 241730607 Test: Build Change-Id: I8cd86f14d5aec72cdf93985217e501ad7d13a229 --- core/java/android/provider/DeviceConfig.java | 7 +++++++ .../com/android/server/am/SettingsToPropertiesMapper.java | 1 + 2 files changed, 8 insertions(+) diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 2483f99a07ec8..b7adcb84102d6 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -754,6 +754,13 @@ public final class DeviceConfig { */ public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native"; + /** + * Namespace for Vendor System Native Boot related features. + * + * @hide + */ + public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT = "vendor_system_native_boot"; + /** * Namespace for memory safety related features (e.g. MTE) * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index d0817b078b615..470de8ce09550 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -99,6 +99,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_SWCODEC_NATIVE, DeviceConfig.NAMESPACE_TETHERING, DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE, + DeviceConfig.NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT, DeviceConfig.NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE, DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE,