From c951fc6076bbe7b637483f4d48e4eacaa699cc61 Mon Sep 17 00:00:00 2001 From: Ian Hua Date: Tue, 5 Oct 2021 15:03:03 +0100 Subject: Add nnapi_native flag namespace. Test: mm Bug: 201399117 Change-Id: I04eff84ac0433b0f829aca7793b1aa261b02a098 --- core/api/system-current.txt | 1 + core/java/android/provider/DeviceConfig.java | 8 ++++++++ .../java/com/android/server/am/SettingsToPropertiesMapper.java | 1 + 3 files changed, 10 insertions(+) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 4a732e544722..0a6594b405ad 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -9138,6 +9138,7 @@ package android.provider { field public static final String NAMESPACE_MEDIA = "media"; field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; + field public static final String NAMESPACE_NNAPI_NATIVE = "nnapi_native"; field public static final String NAMESPACE_OTA = "ota"; field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service"; field public static final String NAMESPACE_PERMISSIONS = "permissions"; diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index f5f5eb880d54..25e3a4fcccc5 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -297,6 +297,14 @@ public final class DeviceConfig { @SystemApi public static final String NAMESPACE_NETD_NATIVE = "netd_native"; + /** + * Namespace for all Android NNAPI related features. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_NNAPI_NATIVE = "nnapi_native"; + /** * Namespace for features related to the Package Manager Service. * diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 2f20efbf5730..3ccacd84a9f3 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -87,6 +87,7 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_LMKD_NATIVE, DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE, + DeviceConfig.NAMESPACE_NNAPI_NATIVE, DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, -- cgit v1.2.3-59-g8ed1b