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

Commit 9787b867 authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifc021bcc82e3bb1f73a3c2c813befb77727adf78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1efdf81f 86acfe36

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

+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ public class SettingsToPropertiesMapper { 
            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.

    //

    // NOTE: please grant write permission system property prefix
@@ -106,7 +110,8 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_MEMORY_SAFETY_NATIVE,

        DeviceConfig.NAMESPACE_HDMI_CONTROL

        DeviceConfig.NAMESPACE_HDMI_CONTROL,

        NAMESPACE_TETHERING_U_OR_LATER_NATIVE

    };



    private final String[] mGlobalSettings;