From aa5d3331948c48763649f8b8b33d5911ad37da51 Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Wed, 16 Dec 2020 17:34:05 -0800 Subject: [PATCH] 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) --- core/java/android/provider/Settings.java | 13 +++++++------ .../validators/GlobalSettingsValidators.java | 8 ++++---- .../providers/settings/SettingsProvider.java | 4 ++-- .../src/android/provider/SettingsBackupTest.java | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4a950b84b1ac9..f96da25b5a6dc 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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. diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 9ad8b56bd5ec9..9ac90f12bc7e6 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index cd05993da326e..294399e754dfd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -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? diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index f747cc1c007d8..1e916ffa5f20a 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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,