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

Commit 7a28974d authored by Justin Chung's avatar Justin Chung Committed by Android (Google) Code Review
Browse files

Merge "Add PAIRED_DEVICE_OS_TYPE_NONE" into main

parents 0dcd04e1 f6dafec4

core/java/android/provider/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -19666,6 +19666,8 @@ public final class Settings { 
            public static final int PAIRED_DEVICE_OS_TYPE_ANDROID = 1;

            /** @hide */

            public static final int PAIRED_DEVICE_OS_TYPE_IOS = 2;

            /** @hide */

            public static final int PAIRED_DEVICE_OS_TYPE_NONE = 3;















            /**















             * The bluetooth settings selected BLE role for the companion.

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -340,7 +340,8 @@ public class GlobalSettingsValidators {













                        new String[] {















                            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)













                            String.valueOf(Global.Wearable.PAIRED_DEVICE_OS_TYPE_IOS),













                            String.valueOf(Global.Wearable.PAIRED_DEVICE_OS_TYPE_NONE)















                        }));















        VALIDATORS.put(















                Global.Wearable.COMPANION_BLE_ROLE,