Craig Mautner
4132620f92
Fix index out of bounds exception
...
When removing the last activity in a stack.
Fixes bug 15776859.
Change-Id: Id507aa7864482ff1ff769833445d937b19de2bcd
2014-06-20 14:38:21 -07:00
Ruben Brunk
a783875420
Merge "camera2: Add AE antibanding + fps range metadata."
2014-06-20 02:04:45 +00:00
Igor Murashkin
e76e8bce93
Merge "camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass"
2014-06-20 03:08:23 +00:00
Eric Laurent
1cff3844da
update SCO audio test app
...
Added test for startBluetoothScoVirtualCall()
Change-Id: I1b47b60a8c5fb0158d4e224252a9d511c612ca2f
2014-06-20 17:49:06 +00:00
Ruben Brunk
5776aafc7e
camera2: Add AE antibanding + fps range metadata.
...
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
2014-06-19 19:20:36 -07:00
John Reck
0916423712
Merge "Add negative guard"
2014-06-20 02:04:45 +00:00
John Reck
7aab5a1f9f
Add negative guard
...
Bug: 15631600
Change-Id: Idd7740f58876e73694fafb8ef55ebaff511f6dca
2014-06-20 09:59:56 -07:00
George Mount
9285d1bf9c
Exclude views that aren't on screen from Activity Transitions.
...
Bug 15704207
Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
2014-06-20 14:09:57 +00:00
Nicolas Prevot
1e2f374e71
Merge "Making more ContentProviders work across users."
2014-06-20 04:43:13 +00:00
Andreas Gampe
b325ce8203
Add a null check to UserAvatarView.setBitmap
...
Adds a null check for the bitmap to set. Resets the paint's shader
in case of a null bitmap to release any previous image.
Change-Id: I1adf3c8ef44522a593fe3f25726b6c83120d7556
2014-06-19 23:51:12 -07:00
Dianne Hackborn
5ff885cd3b
Revert "Add support for tint attribute in VectorDrawable"
...
This reverts commit ab41ea17e6b0407fa76bc9f9183190a9bbc7f560.
Was causing system UI to crash.
2014-06-19 23:02:37 -07:00
Andres Morales
626861c5a5
Merge "Framework changes to support NFC trustlet."
2014-06-20 02:15:46 +00:00
Andres Morales
3b33fd283c
Framework changes to support NFC trustlet.
...
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.
Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
2014-06-20 10:05:52 -07:00
Eric Laurent
2930764885
Merge "AudioManager: add startBluetoothScoVirtualCall()"
2014-06-20 02:09:17 +00:00
Eric Laurent
83900754f3
AudioManager: add startBluetoothScoVirtualCall()
...
Add API to start bluetooth SCO audio connection explicitly
in virtual call mode.
Bug: 11824396.
Change-Id: I1dfab13c659f5855e0b78467ac48b3186af7874c
2014-06-20 10:17:47 -07:00
Yorke Lee
4d9950d13a
Merge "Revert "Add ability to set and get DefaultPhoneApplication""
2014-06-20 02:09:17 +00:00
Yorke Lee
cf9bc5e76d
Revert "Add ability to set and get DefaultPhoneApplication"
...
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.
Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
2014-06-20 10:05:17 -07:00
RoboErik
60c958cd9f
Merge "Remove dead code from keyguard"
2014-06-20 02:09:17 +00:00
Igor Murashkin
49b2b13510
camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass
...
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null
Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
2014-06-19 17:36:07 -07:00
Yorke Lee
eff9661b2a
Merge "Revert "Add getSystemPhoneApplication to TelecommManager""
2014-06-20 00:24:32 +00:00
John Spurlock
ffb9439172
Merge "If we're not showing switch text, don't include in measure."
2014-06-20 00:24:32 +00:00
John Spurlock
e599488968
If we're not showing switch text, don't include in measure.
...
Naive fix for switch crashes when !showText.
Bug:15770311
Change-Id: I68839b61b907d62159e2c12349005683e9ac6436
2014-06-20 10:53:54 -04:00
Jinsuk Kim
2a07054632
Merge "Do not have HdmiControlService report deviceEvent for TV itself"
2014-06-19 23:04:31 +00:00
Jinsuk Kim
13c030e828
Do not have HdmiControlService report deviceEvent for TV itself
...
DeviceEvent should be used only for the other logical device,
not the TV device itself.
Also fixed a but not updating the logical address after the allocation.
Change-Id: I80cec9d5bb4b95d003c9d1c7ea13f02d7e76b322
2014-06-20 13:28:29 +09:00
Dianne Hackborn
19bb5705e1
Merge "Fix build."
2014-06-20 00:06:01 +00:00
Dianne Hackborn
9226fc9bf5
Fix build.
...
Change-Id: I8b05b1dc4fdd0460c2dc92359b85d88b9f0f4f80
2014-06-19 18:32:08 -07:00
Selim Cinek
f99d000764
Improve unlock motion further.
...
Bug: 15244051
Change-Id: I6f567ff327695ec6ece56748cd300b8103715811
2014-06-20 01:19:40 +00:00
Jorim Jaggi
a800167e57
Merge "Hide status bar in bouncer"
2014-06-20 00:06:01 +00:00
Jorim Jaggi
44cf91960d
Hide status bar in bouncer
...
Also, it gets faded in synchronously with the other unlock
animations.
Bug: 15407838
Change-Id: Ie161dfe970a2b4035a2d4cc7bb847285160cf691
2014-06-20 00:47:56 +00:00
Selim Cinek
89faff1dac
Closing the QS when tapping on the notifications now.
...
Bug: 15394230
Change-Id: Ib9f750db69529afc0d56685fb88a13d183b0d3d5
2014-06-20 00:27:37 +00:00
Selim Cinek
00a78899af
Merge "Scrimming the notifications when QS is open."
2014-06-20 00:11:43 +00:00
Selim Cinek
f54090e9bb
Scrimming the notifications when QS is open.
...
Bug: 15394230
Change-Id: I4234bde0259ef296db73a43f69a765dbde5ddacd
2014-06-19 17:20:44 -07:00
Alan Viverette
a97f80562e
Merge "Don't show text in Material-styled switch"
2014-06-20 00:11:43 +00:00
Alan Viverette
2a37cf8d76
Don't show text in Material-styled switch
...
BUG: 15754341
Change-Id: Iae43b31c6e445207a0c95b48d0f0befac0f5cc78
2014-06-19 17:09:10 -07:00
Alan Viverette
e93c90126b
Merge "Add support for tint attribute in VectorDrawable"
2014-06-20 00:06:01 +00:00
Alan Viverette
9a77cb92da
Add support for tint attribute in VectorDrawable
...
Also fixes docs reference in TypedArray.
BUG: 15375203
Change-Id: I8cd2f43bd73f50084e21e5b986af9dc1c1447ad6
2014-06-19 17:16:17 -07:00
Alan Viverette
83415838cf
Merge "Put dither in GradientDrawable constant state"
2014-06-20 00:06:01 +00:00
vandwalle
7610fa66cd
add home network boost
...
Change-Id: I4b508b3f54304c0b3fea126c3905ed3322c2feee
2014-06-19 16:54:53 -07:00
Alan Viverette
07c661e677
Put dither in GradientDrawable constant state
...
Previously the dither attribute would be dropped when cloning a
gradient drawable from constant state. Also fixes ShapeDrawable
theme extraction.
BUG: 15754194
Change-Id: I3071f5b8236cfa6acb549627a3dfac0618518dbf
2014-06-19 16:15:53 -07:00
Sungsoo Lim
b0586c9228
Merge "Make getAvailability() always return true"
2014-06-19 23:04:31 +00:00
Jungshik Jang
7eca94c145
Merge "Use SystemAudioStatusAction in SystemAudioAction."
2014-06-19 23:04:31 +00:00
RoboErik
939f04f971
Remove dead code from keyguard
...
This only removes the pieces that are directly dependent on
IRemoteControlDisplay. There is still code for the transport controls
UI that could be removed.
Change-Id: I0ee4921fcba9aee8d8efcd16e2198a2000147416
2014-06-19 23:02:57 +00:00
Jinsuk Kim
d1fdf0238a
Merge "Report device status event in HdmiControlService"
2014-06-19 22:55:19 +00:00
Jinsuk Kim
4893c7efde
Report device status event in HdmiControlService
...
This change allows the event listener (TIF) to get notified
of the CEC logical device status change (addition/removal),
and update the available tv inputs accordingly.
Change-Id: I7f2798ad47212120ecac8093ad281f683a3d125e
2014-06-20 07:26:17 +09:00
Yorke Lee
5e0f061c0f
Revert "Add getSystemPhoneApplication to TelecommManager"
...
This reverts commit 8200c05dcf206f2621fc8017235c739b66d57e8b.
Change-Id: I6536627491830804ddedac0287fa0bcdf014280c
2014-06-19 22:25:13 +00:00
Jeff Sharkey
0270cfb71d
Merge "Explicitly collect manifest digests."
2014-06-19 22:08:21 +00:00
Jeff Sharkey
032f2b246b
Explicitly collect manifest digests.
...
Previously it was a side effect of collectCertificates().
Bug: 15740334
Change-Id: I2e044fdcc1c86ce730b9570bfbecf873366325e1
2014-06-19 15:49:05 -07:00
Craig Mautner
bb27b1c3a6
Merge "Allow a root activity to relinquish task identity"
2014-06-19 20:37:59 +00:00
Craig Mautner
9d4e9bcebb
Allow a root activity to relinquish task identity
...
If a an acitivty with attribute android:relinquishTaskIdentity true
is the root activity of a task then the intent of that task will
be that of the first activity in the stack with
android:relinquishTaskIdentity set false.
The ability to set intent also includes the ability to set the
TaskDescription of the task.
Fixes bug 15675610.
Fixes bug 10428661.
Change-Id: Ib28a9eae3b9832eeeef9106adbebe344184ee5ae
2014-06-19 16:40:01 -07:00
Adrian Roos
cdf74c2881
Merge "Implement keyguard user switcher"
2014-06-19 20:37:59 +00:00