resolve merge conflicts of e6c7c8e8f2 to cw-e-dev (dfd4b8b2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -6036,6 +6036,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).