From 8d8396b3978cf2dbd7f3fdcec877dc2321e06734 Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Fri, 11 Dec 2020 17:50:34 -0800 Subject: [PATCH] Remove RETAIL_MODE from Settings.Global Bug: 175337585 Test: manual test Change-Id: I3526c1f014e8069cbfc7392f454d430eb474080c (cherry picked from commit 3410090884bc45c7d2c285d6ccfce0c3d758317b) --- core/java/android/provider/Settings.java | 12 ------------ .../validators/GlobalSettingsValidators.java | 7 ------- .../android/providers/settings/SettingsProvider.java | 2 -- .../src/android/provider/SettingsBackupTest.java | 1 - 4 files changed, 22 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 539ce71d62b3d..e95d9c7d9d1c2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17153,18 +17153,6 @@ public final class Settings { public static final String OBTAIN_PAIRED_DEVICE_LOCATION = "obtain_paired_device_location"; - /** - * Whether the device is in retail mode. - * @hide - */ - public static final String RETAIL_MODE = "retail_mode"; - - // Possible retail mode states - /** @hide */ - public static final int RETAIL_MODE_CONSUMER = 0; - /** @hide */ - public static final int RETAIL_MODE_RETAIL = 1; - /** * The play store availability on companion phone. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 7f29c2c95e7ed..751ffe15e0744 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -162,13 +162,6 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.HOTWORD_DETECTION_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.SMART_REPLIES_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION, BOOLEAN_VALIDATOR); - VALIDATORS.put( - Global.Wearable.RETAIL_MODE, - new DiscreteValueValidator( - new String[] { - String.valueOf(Global.Wearable.RETAIL_MODE_CONSUMER), - String.valueOf(Global.Wearable.RETAIL_MODE_RETAIL) - })); VALIDATORS.put( Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY, new DiscreteValueValidator( diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 3b34a62086e9b..0090723513a2c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5235,8 +5235,6 @@ public class SettingsProvider extends ContentProvider { !locationMode.isNull() && !Integer.toString(Secure.LOCATION_MODE_OFF) .equals(locationMode.getValue())); - initGlobalSettingsDefaultValForWearLocked( - Global.Wearable.RETAIL_MODE, Global.Wearable.RETAIL_MODE_CONSUMER); initGlobalSettingsDefaultValForWearLocked( Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY, Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY_UNKNOWN); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 27fc97d56d7fe..83444d5df256e 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -605,7 +605,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.HOTWORD_DETECTION_ENABLED, Settings.Global.Wearable.DEFAULT_VIBRATION, Settings.Global.Wearable.OBTAIN_PAIRED_DEVICE_LOCATION, - Settings.Global.Wearable.RETAIL_MODE, Settings.Global.Wearable.PHONE_PLAY_STORE_AVAILABILITY, Settings.Global.Wearable.BUG_REPORT, Settings.Global.Wearable.SMART_ILLUMINATE_ENABLED,