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

Commit aa5d3331 authored by Josh Yang's avatar Josh Yang Committed by Yeabkal Assegid Wubshit
Browse files

Rename PLAY_STORE_AVAILABILITY with PHONE_PLAY_STORE_AVAILABILITY. 

Bug: 175820762
Test: manual test and unit test
Change-Id: I5a7bb8ba50a14e7589e8cf771545aeaf4ee9362e
(cherry picked from commit e8aa4baedfaa447da9f9211b07e495759b05216b)
parent 95b8d682

core/java/android/provider/Settings.java

+7 −6
Original line number Diff line number Diff line
@@ -16307,18 +16307,19 @@ public final class Settings { 
            public static final int RETAIL_MODE_RETAIL = 1;















            /**













             * The play store availability.













             * The play store availability on companion phone.















             * @hide















             */













            public static final String PLAY_STORE_AVAILABILITY = "play_store_availability";













            public static final String PHONE_PLAY_STORE_AVAILABILITY =













                    "phone_play_store_availability";



























            // Possible play store availability states













            // Possible phone play store availability states















            /** @hide */













            public static final int PLAY_STORE_AVAILABILITY_UNKNOWN = 0;













            public static final int PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN = 0;















            /** @hide */













            public static final int PLAY_STORE_AVAILABLE = 1;













            public static final int PHONE_PLAY_STORE_AVAILABLE = 1;















            /** @hide */













            public static final int PLAY_STORE_UNAVAILABLE = 2;













            public static final int PHONE_PLAY_STORE_UNAVAILABLE = 2;





























            /**















             * Whether the bug report is enabled.

























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



+4
−4




























Original line number
Diff line number
Diff line








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













                            String.valueOf(Global.Wearable.RETAIL_MODE_RETAIL)















                        }));















        VALIDATORS.put(













                Global.Wearable.PLAY_STORE_AVAILABILITY,













                Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,















                new DiscreteValueValidator(















                        new String[] {













                            String.valueOf(Global.Wearable.PLAY_STORE_AVAILABLE),













                            String.valueOf(Global.Wearable.PLAY_STORE_UNAVAILABLE),













                            String.valueOf(Global.Wearable.PLAY_STORE_AVAILABILITY_UNKNOWN)













                            String.valueOf(Global.Wearable.PHONE_PLAY_STORE_AVAILABLE),













                            String.valueOf(Global.Wearable.PHONE_PLAY_STORE_UNAVAILABLE),













                            String.valueOf(Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN)















                        }));















        VALIDATORS.put(















                Global.Wearable.BUG_REPORT,

































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



+2
−2




























Original line number
Diff line number
Diff line








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













                        initGlobalSettingsDefaultValForWearLocked(















                                Global.Wearable.RETAIL_MODE, Global.Wearable.RETAIL_MODE_CONSUMER);















                        initGlobalSettingsDefaultValForWearLocked(













                                Global.Wearable.PLAY_STORE_AVAILABILITY,













                                Global.Wearable.PLAY_STORE_AVAILABILITY_UNKNOWN);













                                Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,













                                Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN);















                        initGlobalSettingsDefaultValForWearLocked(















                                Global.Wearable.BUG_REPORT,















                                "user".equals(Build.TYPE) // is user build?

































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



+1
−1




























Original line number
Diff line number
Diff line








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













                    Settings.Global.Wearable.DEFAULT_VIBRATION,















                    Settings.Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION,















                    Settings.Global.Wearable.RETAIL_MODE,













                    Settings.Global.Wearable.PLAY_STORE_AVAILABILITY,













                    Settings.Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY,















                    Settings.Global.Wearable.BUG_REPORT,















                    Settings.Global.Wearable.SMART_ILLUMINATE_ENABLED,















                    Settings.Global.Wearable.CLOCKWORK_AUTO_TIME,