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

Merge "Add tethering native flag namespace to sDeviceConfigScopes" into udc-dev am: 86acfe363f

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

Change-Id: I397cd19a2102640953145c770c91029161f3bd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2023-06-02 10:23:20 +00:00
committed by Automerger Merge Worker
parent 82b6bbc369 86acfe363f
commit e5311e1315
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,10 @@ public class SettingsToPropertiesMapper {
Settings.Global.NATIVE_FLAGS_HEALTH_CHECK_ENABLED, Settings.Global.NATIVE_FLAGS_HEALTH_CHECK_ENABLED,
}; };
// TODO(b/282593625): Move this constant to DeviceConfig module
private static final String NAMESPACE_TETHERING_U_OR_LATER_NATIVE =
"tethering_u_or_later_native";
// All the flags under the listed DeviceConfig scopes will be synced to native level. // All the flags under the listed DeviceConfig scopes will be synced to native level.
// //
// NOTE: please grant write permission system property prefix // NOTE: please grant write permission system property prefix
@@ -106,7 +110,8 @@ public class SettingsToPropertiesMapper {
DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT, DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,
DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE_BOOT, DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE_BOOT,
DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE, DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE,
DeviceConfig.NAMESPACE_HDMI_CONTROL DeviceConfig.NAMESPACE_HDMI_CONTROL,
NAMESPACE_TETHERING_U_OR_LATER_NATIVE
}; };
private final String[] mGlobalSettings; private final String[] mGlobalSettings;