diff options
| author | 2023-09-07 18:32:55 +0000 | |
|---|---|---|
| committer | 2023-09-07 18:32:55 +0000 | |
| commit | b1339c73d6f9dffe7f7bcd6c6fd95e331f3e8aa7 (patch) | |
| tree | f4ca9ed027b286708b22a1f166cf32e57c1548da | |
| parent | 6e4730971498649860a8f2f7f3033100dab3e227 (diff) | |
| parent | 6f24d3606b34f0ff91660212064d0062953a0ae7 (diff) | |
Merge "Add RESTRICTED constant definition" into main
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f823dbcec7f2..b962d7654a95 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -19255,6 +19255,10 @@ public final class Settings { */ public static final int TETHERED_CONFIG_TETHERED = 2; + /** + * Device is set in restricted mode. + */ + public static final int TETHERED_CONFIG_RESTRICTED = 3; /** * Whether phone switching is supported. diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index bb67bbc39812..ba06185e5663 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -438,7 +438,8 @@ public class GlobalSettingsValidators { new String[] { String.valueOf(Global.Wearable.TETHERED_CONFIG_UNKNOWN), String.valueOf(Global.Wearable.TETHERED_CONFIG_STANDALONE), - String.valueOf(Global.Wearable.TETHERED_CONFIG_TETHERED) + String.valueOf(Global.Wearable.TETHERED_CONFIG_TETHERED), + String.valueOf(Global.Wearable.TETHERED_CONFIG_RESTRICTED) })); VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_SUPPORTED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.WEAR_LAUNCHER_UI_MODE, ANY_INTEGER_VALIDATOR); |