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

Commit 454e59d5 authored by Ajay Panicker's avatar Ajay Panicker Committed by Android (Google) Code Review
Browse files

Merge "Add Filtering for snoop logs based on L2CAP and RFCOMM Channels (2/4)"

parents 6c5b1ff4 2c85718c

core/java/android/provider/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -11103,6 +11103,10 @@ public final class Settings { 
          */

        public static final String PRIVATE_DNS_DEFAULT_MODE = "private_dns_default_mode";

























        /** {@hide} */













        public static final String













                BLUETOOTH_BTSNOOP_DEFAULT_MODE = "bluetooth_btsnoop_default_mode";















        /** {@hide} */















        public static final String















                BLUETOOTH_HEADSET_PRIORITY_PREFIX = "bluetooth_headset_priority_";

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








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













                    Settings.Global.BLOCKED_SLICES,















                    Settings.Global.BLOCKING_HELPER_DISMISS_TO_VIEW_RATIO_LIMIT,















                    Settings.Global.BLOCKING_HELPER_STREAK_LIMIT,













                    Settings.Global.BLUETOOTH_BTSNOOP_DEFAULT_MODE,















                    Settings.Global.BLUETOOTH_A2DP_SINK_PRIORITY_PREFIX,















                    Settings.Global.BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX,















                    Settings.Global.BLUETOOTH_A2DP_SUPPORTS_OPTIONAL_CODECS_PREFIX,

































packages/SettingsLib/res/values/arrays.xml



+14
−0




























Original line number
Diff line number
Diff line








@@ -102,6 +102,20 @@













































    <!-- Bluetooth settings -->













    <!-- Titles for Bluetooth HCI Snoop Logging -->













    <string-array name="bt_hci_snoop_log_entries">













        <item>Disabled</item>













        <item>Enabled Filtered</item>













        <item>Enabled</item>













    </string-array>



























    <!-- Values for Bluetooth HCI Snoop Logging -->













    <string-array name="bt_hci_snoop_log_values" translatable="false">













        <item>disabled</item>













        <item>filtered</item>













        <item>full</item>













    </string-array>





























    <!-- Titles for Bluetooth AVRCP Versions -->















    <string-array name="bluetooth_avrcp_versions">















        <item>AVRCP 1.4 (Default)</item>

































packages/SettingsLib/res/values/strings.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -591,8 +591,8 @@













    <string name="keep_screen_on_summary">Screen will never sleep while charging</string>















    <!-- Setting Checkbox title whether to enable Bluetooth HCI snoop log -->















    <string name="bt_hci_snoop_log">Enable Bluetooth HCI snoop log</string>













    <!-- setting Checkbox summary whether to capture all Bluetooth HCI packets in a file -->













    <string name="bt_hci_snoop_log_summary">Capture all Bluetooth HCI packets in a file (Toggle Bluetooth after changing this setting)</string>













    <!-- setting Checkbox summary whether to capture all Bluetooth HCI packets in a file [CHAR_LIMIT=100] -->













    <string name="bt_hci_snoop_log_summary">Capture Bluetooth packets. (Toggle Bluetooth after changing this setting)</string>















    <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->















    <string name="oem_unlock_enable">OEM unlocking</string>















    <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->