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

Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174522

Change-Id: Ibed4b20e1ebe8c0c464a0f068ffaa3dc46ad1764
This commit is contained in:
Blake Kragten
2020-07-29 23:26:26 +00:00
committed by Automerger Merge Worker
parent 923bd83f83 f4c4ca2327
commit 9c50208f54
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10769,17 +10769,6 @@ public final class Settings {
*/ */
public static final String MODE_RINGER = "mode_ringer"; public static final String MODE_RINGER = "mode_ringer";
/**
* Specifies whether Enhanced Connectivity is enabled or not. This setting allows the
* Connectivity Thermal Power Manager to actively help the device to save power in 5G
* scenarios
* Type: int 1 is enabled, 0 is disabled
*
* @hide
*/
public static final String ENHANCED_CONNECTIVITY_ENABLED =
"enhanced_connectivity_enable";
/** /**
* Overlay display devices setting. * Overlay display devices setting.
* The associated value is a specially formatted string that describes the * The associated value is a specially formatted string that describes the

3
packages/SettingsLib/res/values/strings.xml
View File

@@ -659,9 +659,6 @@
<!-- Setting Checkbox title for enabling Bluetooth Gabeldorsche. [CHAR LIMIT=40] --> <!-- Setting Checkbox title for enabling Bluetooth Gabeldorsche. [CHAR LIMIT=40] -->
<string name="bluetooth_enable_gabeldorsche">Enable Gabeldorsche</string> <string name="bluetooth_enable_gabeldorsche">Enable Gabeldorsche</string>
<!-- Setting Checkbox title for enabling Enhanced Connectivity [CHAR LIMIT=80] -->
<string name="enhanced_connectivity">Enhanced Connectivity</string>
<!-- UI debug setting: Select Bluetooth AVRCP Version --> <!-- UI debug setting: Select Bluetooth AVRCP Version -->
<string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string> <string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string>
<!-- UI debug setting: Select Bluetooth AVRCP Version --> <!-- UI debug setting: Select Bluetooth AVRCP Version -->

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

@@ -270,7 +270,6 @@ public class SettingsBackupTest {
Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,
Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,
Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT, Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
Settings.Global.ENHANCED_4G_MODE_ENABLED, Settings.Global.ENHANCED_4G_MODE_ENABLED,
Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES, Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,
Settings.Global.ERROR_LOGCAT_PREFIX, Settings.Global.ERROR_LOGCAT_PREFIX,