Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove RETAIL_MODE from Settings.Global"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-24 00:08:45 +00:00
committed by Android (Google) Code Review
parent e3c3844c16 8d8396b397
commit 140e2bb595
4 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -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

7
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -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(

2
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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);

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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,