Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d6f3a81 authored by Ian Hua's avatar Ian Hua Committed by Automerger Merge Worker
Browse files

Merge "Add nnapi_native flag namespace." am: bae244dd am: a2cc0a2c 

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

Change-Id: I4b4305fb50decbe6d6336d7613914fd27f87ba60
parents d352c35c a2cc0a2c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -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.

     *

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+1 −0
Original line number Diff line number Diff line
@@ -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,