Jeff Sharkey
971a3cfa51
Migrate VpnProfile definition to framework.
...
Bug: 5756357
Change-Id: I23c4e391e3b48e9645f872ae0145fe672745adca
2012-07-19 17:13:51 -07:00
Jeff Brown
84f85dc70a
Merge "Fix keyguard wake-up issue."
2012-07-19 15:05:50 -07:00
Jeff Brown
ff1baef86c
Fix keyguard wake-up issue.
...
Bug: 6835809
Change-Id: I7a23b50286592b4c4b104b0b6429f2d05fb5e01b
2012-07-19 15:01:17 -07:00
Adam Powell
d81cc4ab5a
Easy "Just once" launches from ResolverActivity
...
Allow a second tap of a selected item in ResolverActivity to launch
the target as "just once" for sloppier/quicker choices.
Change-Id: If05fc7c1ac622195f6253e6ca0868fd87954dd46
2012-07-19 14:14:50 -07:00
Adam Powell
1825b984b4
Merge "Fun with Up navigation"
2012-07-19 11:49:37 -07:00
Steve Block
60620a2399
Merge "Update JavaDoc for PictureListener after fix to capture layers"
2012-07-19 11:44:08 -07:00
John Reck
b077e243ba
Merge "Test aggressive throttling"
2012-07-19 11:28:33 -07:00
Adam Powell
0fc5b2bea0
Fun with Up navigation
...
For activities with a null taskAffinity, simply finish the current task.
(They probably shouldn't have specified a parentActivityName anyway.)
When launching into app info from ResolverActivity, launch the app info
page in the current task with FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET. Back
will return to the resolver, and Up will jump to Settings.
When launching into app info from RecentsPanelView or BaseStatusBar,
since this is a system affordance akin to notifications or widgets,
build the full task stack for the app info activity with
TaskStackBuilder and launch it as a new task.
Change-Id: I73b1941d0f52bd8b30382b5e17edd8ceb058c70d
2012-07-19 11:24:47 -07:00
Steve Block
72498edd88
Update JavaDoc for PictureListener after fix to capture layers
...
Bug: 6389297
Change-Id: I970942f926effbb072ae306c994d25c0e77e3810
2012-07-19 17:02:06 +01:00
Fabrice Di Meglio
016456e432
Fix padding resolution
...
Change-Id: I2181a0a4057be0d20744b1512dbc1fbc53490d81
2012-07-18 16:14:57 -07:00
Adam Powell
a9108a217e
Add View#generateViewId; make RadioGroup use it
...
Bug 6448164
generateViewId provides a way for applications to generate opaque ID
values suitable for use with View#setId that will not collide with
values generated by aapt for R.id.
Fix a bug where RadioGroup assumes object hash codes will always be
positive.
Change-Id: I3e2870cd672d6061bb465128f428c81aeef0c44b
2012-07-18 14:27:00 -07:00
Haoyu Bai
db3c8678e5
Network data activity change intent for network interfaces.
...
The activity notification is received from netd, an intent
DATA_ACTIVITY_CHANGE is then raised for other part of the system to
consume.
Change-Id: Idfcc4763c51c5b314c57f546c12557082f06bebf
2012-07-17 17:13:03 -07:00
Jonathan Dixon
f6468ca4dc
Merge "Remove deprecated methods from webview provider interface"
2012-07-17 15:41:29 -07:00
Adam Powell
5d1f11d9c2
Merge "Fix MediaRouteActionProvider button sizing"
2012-07-17 14:03:59 -07:00
Adam Powell
8c1b02e759
Fix MediaRouteActionProvider button sizing
...
Bug 6768999
Use proper layout height for MediaRouteButtons generated from
MediaRouteActionProvider.
Update ActionMenuView's LayoutParams handling to correctly propagate
width/height values if the supplied LayoutParams is of a different
type.
Change-Id: I1e1b250d873869ca27f59ffb06ccf2299d57b40d
2012-07-17 13:57:59 -07:00
Steve Block
6bcb45934e
Merge "Improve JavaDoc for WebView.restoreState()"
2012-07-17 08:22:31 -07:00
Steve Block
42499061be
Improve JavaDoc for WebView.restoreState()
...
Change-Id: I01b3f8ac78b08ef0a6f563fa63978934a23fd183
2012-07-17 16:01:38 +01:00
Fred
a8c6df0d3a
Removed startService() call from BluetoothManagerService.
...
BT enable()/disable() are handled by using the binder interface
Change-Id: I0bb8d4984129706e424320241ca3ea7e12caf0d3
Conflicts:
core/java/android/bluetooth/IBluetooth.aidl
2012-07-16 21:29:44 -07:00
Matthew Xie
9631314e3d
Fix merge error, put in tmp workaround for input manager.
...
Fix merge error, missing enableNoAutoConnect api.
Remove bluetoothF from inputManageF.systemReady call as tmp workaround.
Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread
Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
2012-07-16 21:29:12 -07:00
fredc
5a1195fd5f
Fixed issue with ActivityChooserView not working if there is only 1 share option available
...
Change-Id: If21742f3ddc28f54bf8da6cbc7e81ee0df19d6f0
2012-07-16 21:28:28 -07:00
fredc
bf072a712f
Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to BluetoothManagerService
...
Change-Id: I88e5f3fe050cf11eae9c5cf1b7c393a178b8f9b1
2012-07-16 21:28:12 -07:00
Swaminatha Balaji
20738945d4
Auto connect hf/a2dp
...
Change-Id: I7c1fb4e2614f65e6810f195814dcf0cad88aee21
2012-07-16 21:26:46 -07:00
zzy
7329e70841
Added code to tear down dhcp thread when tethering is off
2012-07-16 21:25:57 -07:00
fredc
d6883533e4
Fixed socket not closing on BT off. Used RemoteCallbackList to monitor binder deaths in BluetoothManagerService.
...
Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
2012-07-16 21:25:05 -07:00
fredc
903ac6f399
Fixed issue with Settings app crashing after during on/off and unpair.
...
Fixed issue with BluetoothAdapter.getRemoteDevice() returning null.
Change-Id: Ie86813532530a6b57bde1c430c7b4875ecc7354c
2012-07-16 21:24:32 -07:00
Ravi Nagarajan
7077272d8f
Disable debug logs in BluetoothDevice, that was turned on accidentally Change-Id: I8a0a3f5775c2b9f5a928e4840851e687f25b57ab
2012-07-16 21:24:09 -07:00
fredc
116d1d4696
Fixed issue with getting Bluetooth adapter's name and airplane mode
...
Change-Id: I18b632223574aa41b09ba30de8e35417fad86cbe
2012-07-16 21:23:34 -07:00
Sreenidhi T
4bedba49fe
Change done in BluetoothAdapter to use the same API for interacting with the Bluetooth Service. setName was being done using mService while getName was using mManagerService. As a result, the device name was not being updated in Localadapter getname call. Modified to use mService in both cases.
...
Change-Id: I2e900a782df11fd511319fbb42d94324e50ae89b
2012-07-16 21:22:32 -07:00
Kausik Sinnaswamy
a097f51e5f
BT enable adapter API should return TRUE or FALSE.
...
Change-Id: Iaef14c51d3407b69505c55a0bbdaf902213402cf
2012-07-16 21:21:23 -07:00
fredc
0f42037eb7
Non persistent adapter service
...
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5
Conflicts:
core/java/android/bluetooth/BluetoothInputDevice.java
Conflicts:
core/java/com/android/internal/app/ShutdownThread.java
services/java/com/android/server/SystemServer.java
Conflicts:
services/java/com/android/server/SystemServer.java
services/java/com/android/server/pm/ShutdownThread.java
2012-07-16 21:20:54 -07:00
Ravi Nagarajan
919a4c6264
Handle cancel bond for both legacy and ssp pairing
...
Change-Id: I7a6db3cd7b5b8e72dca988e753dcba9a8df614c8
2012-07-16 21:20:29 -07:00
Priti Aghera
349e62f329
HID-PTS: Included apis' for pts tests
...
Change-Id: I7dc0a893ee86a2560c351a565bd170517f6c6079
2012-07-16 21:20:07 -07:00
fredc
4c9cacadcc
Added support to get a remote device's service UUIDs
...
Change-Id: I9aa47ac2bb7377aca268e95fec31c518358b3065
2012-07-16 21:19:51 -07:00
Srikanth Uppala
827de2d73e
Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup
...
Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
2012-07-16 21:19:35 -07:00
zzy
3b147b7702
Added new rfcomm multi accept code
2012-07-16 21:19:18 -07:00
Matthew Xie
13450df2b9
Initial Health Profile implementation
...
Change-Id: I22f35073ceb131d84df6b233d1b63d20fa1b4451
2012-07-16 21:18:56 -07:00
Matthew Xie
bf246ef0ab
Initial implementation of HID, add IBluetoothInputDevice idl
...
Change-Id: Iadc79a425b4b6e12329d86dd2ac0782adcb0174d
2012-07-16 21:18:36 -07:00
Priti Aghera
db44b20fe6
Added support to cancel pairing from UI while doing SSP.
...
The new code sends SSPReply with one of the arguments as false.
Signed-off-by: Priti Aghera <paghera@broadcom.com>
2012-07-16 21:18:08 -07:00
Matthew Xie
14b330d3a6
add queryPhoneState in IBluetoothHeadsetPhone
...
Change-Id: I10a9237518f04c1453d09f9a10b6ce0e6107056a
2012-07-16 21:17:41 -07:00
Matthew Xie
3e8c82edb1
Framework changes for HFP and A2DP profile implementation of the new stack.
...
Add IBluetoothHeadsetPhone.aidl for a small service in Phone to get
phone state changes
Change-Id: I1015e4a69720c4e9cd18ae4236ccd0dbff2e1b2c
2012-07-16 21:17:05 -07:00
Jaikumar Ganesh
e21a4ac09d
Add a new version of the disable API.
...
This allows for the setting to be persisted or not.
Also turn on Bluetooth in System Server if needed.
It won't work currently because the service wouldn't have
started.
Change-Id: I15fa2bff93aa32134c1b565fcbe90ba68614b6a1
2012-07-16 21:14:15 -07:00
Matthew Xie
75780aa431
Merge "Changes for new Bluetooth APIs."
2012-07-16 21:13:38 -07:00
Matthew Xie
3a6794cad7
Merge "Changes to Bluetooth Service structure."
2012-07-16 21:13:26 -07:00
Matthew Xie
d4d4e715c5
Merge "Delete various Bluetooth files for stack integration."
2012-07-16 21:09:13 -07:00
Glenn Kasten
5e457b70ce
Merge "Increase SchedulingPolicyService.PRIORITY_MAX to 3"
2012-07-16 16:27:44 -07:00
Jeff Brown
c69238ebc8
Merge "Remove dithering support."
2012-07-16 16:18:13 -07:00
Jeff Brown
3cc321ecf5
Remove dithering support.
...
The dithering flag is no longer implemented in Surface Flinger
so this is all dead code.
Change-Id: I74c0e452923207e5b7cfe0eeca9457e5cb990947
2012-07-16 16:17:25 -07:00
Jeff Brown
abae83d155
Merge "Remove freeze(), unfreeze() and setFreezeTint()."
2012-07-16 15:53:00 -07:00
Jeff Brown
f422a56694
Merge "Remove freezeDisplay(), which is no-op."
2012-07-16 15:52:54 -07:00
Jeff Brown
ef4e817ad6
Remove freeze(), unfreeze() and setFreezeTint().
...
This is all dead code.
Change-Id: Ia8a3068606bfe277a16cde5690f47996657863e8
2012-07-16 15:02:49 -07:00