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

Commit 0969f589 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate "phone_switching_supported" key in Settings Provider" into main

parents 88e37111 d73ba463

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -20217,14 +20217,6 @@ public final class Settings { 
             */

            public static final int TETHERED_CONFIG_RESTRICTED = 3;













            /**













             * Whether phone switching is supported.













             *













             * (0 = false, 1 = true)













             * @hide













             */













            public static final String PHONE_SWITCHING_SUPPORTED = "phone_switching_supported";



























            /**















             * Setting indicating the name of the Wear OS package that hosts the Media Controls UI.















             *

























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -445,7 +445,6 @@ public class GlobalSettingsValidators {













                                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);















        VALIDATORS.put(Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.CONNECTIVITY_KEEP_DATA_ON, BOOLEAN_VALIDATOR);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -629,7 +629,6 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.CUSTOM_COLOR_BACKGROUND,















                    Settings.Global.Wearable.PHONE_SWITCHING_STATUS,















                    Settings.Global.Wearable.TETHER_CONFIG_STATE,













                    Settings.Global.Wearable.PHONE_SWITCHING_SUPPORTED,















                    Settings.Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE,















                    Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE,















                    Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED,