Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding native flag namespace for lmkd." am: 1fdacf6376

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

Change-Id: I8d661ad5868a7df5df08e67574bcd1eda9092772
This commit is contained in:
Suren Baghdasaryan
2021-08-11 23:13:07 +00:00
committed by Automerger Merge Worker
parent 726c374fa3 1fdacf6376
commit eb10acc1cb
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -7768,6 +7768,7 @@ package android.provider {
field public static final String NAMESPACE_GAME_DRIVER = "game_driver"; field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention";
field public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";
field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; 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_NETD_NATIVE = "netd_native";
field public static final String NAMESPACE_OTA = "ota"; field public static final String NAMESPACE_OTA = "ota";

8
core/java/android/provider/DeviceConfig.java
View File

@@ -200,6 +200,14 @@ public final class DeviceConfig {
public static final String NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS = public static final String NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS =
"intelligence_content_suggestions"; "intelligence_content_suggestions";
/**
* Namespace for all lmkd related features.
*
* @hide
*/
@SystemApi
public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";
/** /**
* Namespace for all media native related features. * Namespace for all media native related features.
* *

1
services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
View File

@@ -84,6 +84,7 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_CONNECTIVITY, DeviceConfig.NAMESPACE_CONNECTIVITY,
DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT, DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,
DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS, DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,
DeviceConfig.NAMESPACE_LMKD_NATIVE,
DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_MEDIA_NATIVE,
DeviceConfig.NAMESPACE_NETD_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE,
DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT, DeviceConfig.NAMESPACE_PROFCOLLECT_NATIVE_BOOT,