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

Commit da8c63b8 authored by Josh Yang's avatar Josh Yang Committed by Haiping Yang
Browse files

Rename BLUETOOTH_MODE to PAIRED_DEVICE_OS_TYPE. 

The BLUETOOTH_MODE setting is meant to distinguish the OS type of paired
device. So it makes sense to have a more straightforward name for users
to easily understanding its expected usage.

Bug: 176835928, 191375904
Test: manual test and unit test.
Change-Id: I8a3431c4c05943c13f620ffb89a431c2cda764ad
parent ec978663

core/java/android/provider/Settings.java

+6 −6
Original line number Diff line number Diff line
@@ -16581,18 +16581,18 @@ public final class Settings { 
            public static final String COMPANION_ADDRESS = "companion_address";















            /**













             * What bluetooth mode we are in.













             * What OS does paired device has.















             * @hide















             */













            public static final String BLUETOOTH_MODE = "bluetooth_mode";













            public static final String PAIRED_DEVICE_OS_TYPE = "paired_device_os_type";



























            // Possible values of BLUETOOTH_MODE













            // Possible values of PAIRED_DEVICE_OS_TYPE















            /** @hide */













            public static final int BLUETOOTH_MODE_UNKNOWN = 0;













            public static final int PAIRED_DEVICE_OS_TYPE_UNKNOWN = 0;















            /** @hide */













            public static final int BLUETOOTH_MODE_NON_ALT = 1;













            public static final int PAIRED_DEVICE_OS_TYPE_ANDROID = 1;















            /** @hide */













            public static final int BLUETOOTH_MODE_ALT = 2;













            public static final int PAIRED_DEVICE_OS_TYPE_IOS = 2;





























            /**















             * The bluetooth settings selected BLE role for the companion.

























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



+4
−4




























Original line number
Diff line number
Diff line








@@ -266,12 +266,12 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN, ANY_INTEGER_VALIDATOR);















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















        VALIDATORS.put(













                Global.Wearable.BLUETOOTH_MODE,













                Global.Wearable.PAIRED_DEVICE_OS_TYPE,















                new DiscreteValueValidator(















                        new String[] {













                            String.valueOf(Global.Wearable.BLUETOOTH_MODE_UNKNOWN),













                            String.valueOf(Global.Wearable.BLUETOOTH_MODE_ALT),













                            String.valueOf(Global.Wearable.BLUETOOTH_MODE_NON_ALT)













                            String.valueOf(Global.Wearable.PAIRED_DEVICE_OS_TYPE_UNKNOWN),













                            String.valueOf(Global.Wearable.PAIRED_DEVICE_OS_TYPE_ANDROID),













                            String.valueOf(Global.Wearable.PAIRED_DEVICE_OS_TYPE_IOS)















                        }));















        VALIDATORS.put(















                Global.Wearable.COMPANION_BLE_ROLE,

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -5357,8 +5357,8 @@ public class SettingsProvider extends ContentProvider {













                        initGlobalSettingsDefaultValForWearLocked(















                                Settings.Global.Wearable.COMPANION_ADDRESS, "");















                        initGlobalSettingsDefaultValForWearLocked(













                                Settings.Global.Wearable.BLUETOOTH_MODE,













                                Settings.Global.Wearable.BLUETOOTH_MODE_UNKNOWN);













                                Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE,













                                Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE_UNKNOWN);















                        initGlobalSettingsDefaultValForWearLocked(















                                Settings.Global.Wearable.USER_HFP_CLIENT_SETTING,















                                Settings.Global.Wearable.HFP_CLIENT_UNSET);

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -647,7 +647,7 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.AMBIENT_LOW_BIT_ENABLED,















                    Settings.Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN,















                    Settings.Global.Wearable.COMPANION_ADDRESS,













                    Settings.Global.Wearable.BLUETOOTH_MODE,













                    Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE,















                    Settings.Global.Wearable.COMPANION_BLE_ROLE,















                    Settings.Global.Wearable.COMPANION_NAME,















                    Settings.Global.Wearable.USER_HFP_CLIENT_SETTING,