Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp
* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '8028cea196968a4744ac4b095f6fe6bc32467375'
* commit '8028cea196968a4744ac4b095f6fe6bc32467375':
BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp
* commit '2c4899737be92b858a9e2d9d743709cae310149b':
Change USB tab to USB storage if it fits
Merge commit '836b4297ccde47ae6356b2a805394d3285368144'
* commit '836b4297ccde47ae6356b2a805394d3285368144':
DO NOT MERGE Add null check before disconnecting a device.
Merge commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e'
* commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e':
Call disconnect / connect without checking the current status
Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp
* commit 'd3abea0d70648e77e694780b7e139b0ed36ba483':
Fix a few more cases of USB storage missed at 4am pass...
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp
* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
Disconnect dock only if its connected.
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.
Bug: 3097224
Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
Merge commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31'
* commit '52e8542d9dfb9c0d9a3530df1d790a0275d27f31':
Don't show the sort menu for running process list
Merge commit '8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp
* commit '8021537ffea45d1a36274217610a314b3a0ac774':
BT settings wait for HS service before connect. DO NOT MERGE
Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.
Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.
Bug: 3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
Merge commit 'f233ec77eb359aebd0276a27b09c0abe8e0f67ea'
* commit 'f233ec77eb359aebd0276a27b09c0abe8e0f67ea':
With luck, final take on bug3076083, re back up settting
Merge commit '0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp
* commit '0340371297887290d7593d7c346e422a4c9ecd1a':
DO NOT MERGE Add null check before disconnecting a device.
Merge commit 'bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp
* commit 'bdf1310707e436db484113d7aa2881c966cddd0f':
Call disconnect / connect without checking the current status
Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp
* commit 'cd99332fee649afd85798499cea5c45a098b8a20':
Update settings app for new NFC API.
