Merge "Add nnapi_native flag namespace." am: bae244ddd1 am: a2cc0a2c8a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845056

Change-Id: I4b4305fb50decbe6d6336d7613914fd27f87ba60
This commit is contained in:
Ian Hua
2021-10-19 16:26:44 +00:00
committed by Automerger Merge Worker
3 changed files with 10 additions and 0 deletions

View File

@@ -9139,6 +9139,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";

View File

@@ -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.
*

View File

@@ -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,