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

Commit ccafc266 authored by Josh Yang's avatar Josh Yang
Browse files

Remove COMPANION_ADDRESS and COMPANION_ADDRESS_DUAL 

These settings are migrated back to legacy provider due to privacy
concerns.

Bug: 177440725
Test: manual test and unit test
Change-Id: If9d3f76a34ef3a7ec2bf32375f78a046d1ab4abc
(cherry picked from commit 2823d842978ac16713010251b6a4e3d9fa074059)
parent 8e9b12cd

core/java/android/provider/Settings.java

+0 −12
Original line number Diff line number Diff line
@@ -16608,12 +16608,6 @@ public final class Settings { 
             */

            public static final String WEAR_PLATFORM_MR_NUMBER = "wear_platform_mr_number";













            /**













             * The bluetooth settings storing duplicate address of companion device.













             * @hide













             */













            public static final String COMPANION_BT_ADDRESS_DUAL = "companion_bt_address_dual";



























            /**















             * The offset of the visible screen from the display bottom (overscan bottom).















             * @hide










@@ -16705,12 +16699,6 @@ public final class Settings {













             */















            public static final String AMBIENT_PLUGGED_TIMEOUT_MIN = "ambient_plugged_timeout_min";



























            /**













             * The companion device's bluetooth address.













             * @hide













             */













            public static final String COMPANION_ADDRESS = "companion_address";



























            /**















             * What OS does paired device has.















             * @hide

























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



+0
−2




























Original line number
Diff line number
Diff line








@@ -5344,8 +5344,6 @@ public class SettingsProvider extends ContentProvider {













                    initGlobalSettingsDefaultValForWearLocked(















                            Settings.Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN,















                            SystemProperties.getInt("ro.ambient.plugged_timeout_min", -1));













                    initGlobalSettingsDefaultValForWearLocked(













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















                    initGlobalSettingsDefaultValForWearLocked(















                            Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE,















                            Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE_UNKNOWN);

































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



+0
−2




























Original line number
Diff line number
Diff line








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













                    Settings.Global.Wearable.SYSTEM_CAPABILITIES,















                    Settings.Global.Wearable.SYSTEM_EDITION,















                    Settings.Global.Wearable.WEAR_PLATFORM_MR_NUMBER,













                    Settings.Global.Wearable.COMPANION_BT_ADDRESS_DUAL,















                    Settings.Global.Wearable.DISPLAY_SHAPE,















                    Settings.Global.Wearable.BOTTOM_OFFSET,















                    Settings.Global.Wearable.SCREEN_BRIGHTNESS_LEVEL,









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













                    Settings.Global.Wearable.AMBIENT_GESTURE_SENSOR_ID,















                    Settings.Global.Wearable.AMBIENT_LOW_BIT_ENABLED,















                    Settings.Global.Wearable.AMBIENT_PLUGGED_TIMEOUT_MIN,













                    Settings.Global.Wearable.COMPANION_ADDRESS,















                    Settings.Global.Wearable.PAIRED_DEVICE_OS_TYPE,















                    Settings.Global.Wearable.COMPANION_BLE_ROLE,















                    Settings.Global.Wearable.COMPANION_NAME,