diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-20 11:33:07 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-04-20 11:33:07 -0700 |
| commit | 303cef4c34e57ac019fe825f24c2fb4fa611ac4e (patch) | |
| tree | 5f8d1509763390490780d47807db9674e3b167da /core | |
| parent | 9878124adb6f4de9dae0d9eb76102e993fc0b9a9 (diff) | |
| parent | 3cd1905d857913241198f65066e1aa78516192ea (diff) | |
| download | frameworks_base-303cef4c34e57ac019fe825f24c2fb4fa611ac4e.zip frameworks_base-303cef4c34e57ac019fe825f24c2fb4fa611ac4e.tar.gz frameworks_base-303cef4c34e57ac019fe825f24c2fb4fa611ac4e.tar.bz2 | |
Merge tag 'android-6.0.1_r30' into HEAD
Ticket: RM-234
Android 6.0.1 release 30
Change-Id: I1bd7cf4081a12d28dc5da8b53b9124180afaa23d
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f6642d8..5045b1a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6445,6 +6445,18 @@ public final class Settings { public static final String BLUETOOTH_DISABLED_PROFILES = "bluetooth_disabled_profiles"; /** + * 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> |