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

Commit 7a4883c3 authored Feb 04, 2021 by Josh Yang

Remove HFP_CLIENT_PROFILE_ENABLED which is no longer needed

Bug: 176837861
Test: unit test
Change-Id: I782881f5298e688716546c7bac78d2cbb851076a
(cherry picked from commit a5df150c91e0f2b1e3827d0683d827d0c4b74ab6)

parent 8e9b12cd

core/java/android/provider/Settings.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -16757,12 +16757,6 @@ public final class Settings {
		/** @hide */
		public static final int HFP_CLIENT_DISABLED = 2;

		/**
		* The current HFP client profile setting.
		* @hide
		*/
		public static final String HFP_CLIENT_PROFILE_ENABLED = "hfp_client_profile_enabled";

		/**
		* The companion phone's android version.
		* @hide

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,6 @@ public class GlobalSettingsValidators {
		String.valueOf(Global.Wearable.HFP_CLIENT_ENABLED),
		String.valueOf(Global.Wearable.HFP_CLIENT_DISABLED)
		}));
		VALIDATORS.put(Global.Wearable.HFP_CLIENT_PROFILE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR);

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -5359,12 +5359,6 @@ public class SettingsProvider extends ContentProvider {
		disabledProfileSetting.isNull()
		? 0
		: Long.parseLong(disabledProfileSetting.getValue());
		final boolean isHfpClientProfileEnabled =
		(disabledProfileSettingValue & (1 << BluetoothProfile.HEADSET_CLIENT))
		== 0;
		initGlobalSettingsDefaultValForWearLocked(
		Settings.Global.Wearable.HFP_CLIENT_PROFILE_ENABLED,
		isHfpClientProfileEnabled);
		initGlobalSettingsDefaultValForWearLocked(
		Settings.Global.Wearable.COMPANION_OS_VERSION,
		Settings.Global.Wearable.COMPANION_OS_VERSION_UNDEFINED);

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -652,7 +652,6 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.COMPANION_BLE_ROLE,
		Settings.Global.Wearable.COMPANION_NAME,
		Settings.Global.Wearable.USER_HFP_CLIENT_SETTING,
		Settings.Global.Wearable.HFP_CLIENT_PROFILE_ENABLED,
		Settings.Global.Wearable.COMPANION_OS_VERSION,
		Settings.Global.Wearable.ENABLE_ALL_LANGUAGES,
		Settings.Global.Wearable.SETUP_LOCALE,