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

Commit 44d92fce authored by Blake Kragten's avatar Blake Kragten Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I09d21b8405050e4ef1474444ca5ec0b7f71406be
parents 92ffd8ab f4c4ca23

core/java/android/provider/Settings.java

+0 −11
Original line number Diff line number Diff line
@@ -10769,17 +10769,6 @@ public final class Settings { 
        */

       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.















         * The associated value is a specially formatted string that describes the

































packages/SettingsLib/res/values/strings.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -659,9 +659,6 @@













    <!-- Setting Checkbox title for enabling Bluetooth Gabeldorsche. [CHAR LIMIT=40] -->















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















    <string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string>















    <!-- UI debug setting: Select Bluetooth AVRCP Version -->

































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



+0
−1




























Original line number
Diff line number
Diff line








@@ -270,7 +270,6 @@ public class SettingsBackupTest {













                    Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS,















                    Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS,















                    Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,













                    Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,















                    Settings.Global.ENHANCED_4G_MODE_ENABLED,















                    Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,















                    Settings.Global.ERROR_LOGCAT_PREFIX,