summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2016-01-14 14:20:34 -0800
committerThe Android Automerger <android-build@google.com>2016-02-24 13:21:16 -0800
commit4de51e4130c76562e5d4a13b56bd204b9d92f4e7 (patch)
tree48ae0141580464e2d47e1b7ad98cbba453e9e4a9 /core
parentd60d0078d8a8a54ef898d936413321a085abff0d (diff)
downloadframeworks_base-4de51e4130c76562e5d4a13b56bd204b9d92f4e7.zip
frameworks_base-4de51e4130c76562e5d4a13b56bd204b9d92f4e7.tar.gz
frameworks_base-4de51e4130c76562e5d4a13b56bd204b9d92f4e7.tar.bz2
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
Interop database entries are stored in the system settings entry "BluetoothInteropDatabase". The format is a list of entries separated by ";". An entry consists of a BDA fragment, followed by a comma and an integer representing a feature from interop.h. Example: To disable LE secure connections for devices starting with BDA 11:22:33, use "11:22:33,0". Bug: 26548845 Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949 (cherry picked from commit 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1f9a526..14f8fdd 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6030,6 +6030,18 @@ public final class Settings {
public static final String AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";
/**
+ * A semi-colon separated list of Bluetooth interoperability workarounds.
+ * Each entry is a partial Bluetooth device address string and an integer representing
+ * the feature to be disabled, separated by a comma. The integer must correspond
+ * to a interoperability feature as defined in "interop.h" in /system/bt.
+ * <p>
+ * Example: <br/>
+ * "00:11:22,0;01:02:03:04,2"
+ * @hide
+ */
+ public static final String BLUETOOTH_INTEROPERABILITY_LIST = "bluetooth_interoperability_list";
+
+ /**
* The policy for deciding when Wi-Fi should go to sleep (which will in
* turn switch to using the mobile data as an Internet connection).
* <p>