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

Commit 140e2bb5 authored May 24, 2022 by TreeHugger Robot Committed by Android (Google) Code Review May 24, 2022

Merge "Remove RETAIL_MODE from Settings.Global"

parents e3c3844c 8d8396b3

core/java/android/provider/Settings.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -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

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -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(

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,