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

Unverified Commit b78ad8b2 authored by Oliver Scott's avatar Oliver Scott Committed by Michael Bestas
Browse files

fw/b: Add setting to allow tethering to use VPN upstreams 

Change-Id: I77ed0142e653f4993486eea44e4dac21e3f67f17
parent 8e2a312d

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -13104,6 +13104,17 @@ public final class Settings { 
        public static final String EXTRA_AUTOMATIC_POWER_SAVE_MODE =

                "extra_automatic_power_save_mode";









        /**









         * Whether tethering is allowed to use VPN upstreams. (0 = false, 1 = true)









         * Any changes here must also be reflected in:









         * packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering/









         * Tethering.java









         * packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering/









         * UpstreamNetworkMonitor.java









         * @hide









         */









        public static final String TETHERING_ALLOW_VPN_UPSTREAMS = "tethering_allow_vpn_upstreams";

















        /**









         * Whether contextual screen timeout is enabled.









         *


































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -288,6 +288,7 @@ public class SecureSettings {







        Settings.Secure.ON_DEVICE_INTELLIGENCE_UNBIND_TIMEOUT_MS,









        Settings.Secure.ON_DEVICE_INFERENCE_UNBIND_TIMEOUT_MS,









        Settings.Secure.ON_DEVICE_INTELLIGENCE_IDLE_TIMEOUT_MS,









        Settings.Secure.TETHERING_ALLOW_VPN_UPSTREAMS,









        Settings.Secure.MANDATORY_BIOMETRICS,









        Settings.Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,









        Settings.Secure.ADVANCED_PROTECTION_MODE,


































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -459,6 +459,7 @@ public class SecureSettingsValidators {







        VALIDATORS.put(Secure.ON_DEVICE_INFERENCE_UNBIND_TIMEOUT_MS, ANY_LONG_VALIDATOR);









        VALIDATORS.put(Secure.ON_DEVICE_INTELLIGENCE_UNBIND_TIMEOUT_MS, ANY_LONG_VALIDATOR);









        VALIDATORS.put(Secure.ON_DEVICE_INTELLIGENCE_IDLE_TIMEOUT_MS, NONE_NEGATIVE_LONG_VALIDATOR);









        VALIDATORS.put(Secure.TETHERING_ALLOW_VPN_UPSTREAMS, BOOLEAN_VALIDATOR);









        VALIDATORS.put(Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED, BOOLEAN_VALIDATOR);









        VALIDATORS.put(Secure.MANDATORY_BIOMETRICS, new InclusiveIntegerRangeValidator(0, 1));









        VALIDATORS.put(Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,