diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2016-02-24 11:36:27 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2016-02-24 11:36:27 -0800 |
| commit | dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f (patch) | |
| tree | 2c57bcf04de36f43402bdfdbb7153807668d9b11 /core/java | |
| parent | d46bd9153144f905138e0b609c3d8252a5d5505e (diff) | |
| parent | e6c7c8e8f266f4021bef1dbb3636472eb44ed23d (diff) | |
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f
Diffstat (limited to 'core/java')
| -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 9a7d7bb583a7..e7f71682ac8f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6037,6 +6037,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> |