John Reck
1698297daf
Merge "DO NOT MERGE Copy shaders" into lmp-dev
2014-08-26 14:53:34 +00:00
Youngsang Cho
c931cc0850
Merge "Reset a session callback variable when tune is failed" into lmp-dev
2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455
Reset a session callback variable when tune is failed
...
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
2014-08-26 23:12:59 +09:00
Jorim Jaggi
359404c786
Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev
2014-08-26 13:57:25 +00:00
Nicolas Prevot
fb9cf2309d
Merge "Preventing apps from granting uris to any other user." into lmp-dev
2014-08-26 13:42:27 +00:00
Jorim Jaggi
6bad244c4e
Fix invalid keyguard state after pressing back in bouncer
...
Bug: 16886960
Change-Id: Ib071b302f9cb2f1fec32285e05a5b8585e53e41e
2014-08-26 15:24:01 +02:00
Nicolas Prevot
83bb610fad
Preventing apps from granting uris to any other user.
...
And adding some javadoc.
BUG: 16996334
Change-Id: I02b03e513050e2704c28da8e17c2c977d858627b
2014-08-26 14:16:00 +01:00
Jorim Jaggi
64d04347a8
Merge "Always allow translucent bars for keyguard" into lmp-dev
2014-08-26 13:11:11 +00:00
Chulwoo Lee
ffad70bb7e
Recreate overlay view after the TIS crashes
...
The overlay view should be recreated when the session is recreated
after the TIS crash.
Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
2014-08-26 21:30:26 +09:00
Jorim Jaggi
5369d7a931
Merge "Fix swipe up affordance bugs" into lmp-dev
2014-08-26 10:38:41 +00:00
Jorim Jaggi
31e0ae0cad
Merge "Make date consistent with spec when alarm is set" into lmp-dev
2014-08-26 10:35:41 +00:00
Ruben Brunk
6d388af853
Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev
2014-08-26 06:55:26 +00:00
Ihab Awad
ed25dda8ba
Merge "Support Conferences in Remote Connections" into lmp-dev
2014-08-26 05:30:17 +00:00
Jungshik Jang
339227da7c
Fix several bugs in HdmiControlService.
...
1. Fix HdmniLogger null pointer exception
2. Should check arc enabled port for arc requests
3. Disallow ARC action coming from indirect AVR device.
4. Check original opcode of feature action
5. Add bitmasking to all parameters of cec message.
Bug: 17243701, Bug: 17238394, Bug: 17241401
Change-Id: Iff0da78b0de9a29fb00e683c261528e0baea66af
2014-08-26 14:13:57 +09:00
Ihab Awad
b8e85c74e5
Support Conferences in Remote Connections
...
Bug: 16957997
Change-Id: I598854b43aad2f10b5322439741588f5326b74c2
2014-08-25 21:51:19 -07:00
Adrian Roos
93b18bda1b
Update soundscape for L
...
Bug: 15725449
Change-Id: I8c1033b24a50a61185d042bd6d214d7a3407ccbe
2014-08-26 04:24:31 +00:00
Dan Sandler
ea75fddbb4
Allow listeners to fetch current notifications by key.
...
Bug: 16574195
Change-Id: I269dbcc7fc8912d84229f6a3d950b0015625ae7a
2014-08-26 04:24:10 +00:00
Chulwoo Lee
f710befdab
Merge "Fix checking trackId" into lmp-dev
2014-08-26 02:46:42 +00:00
Chulwoo Lee
984d99b584
Fix checking trackId
...
BUG: 17261638
Change-Id: I141b7c9de1289c49f29d2f1e1ac534045abb333d
2014-08-26 11:29:17 +09:00
Adam Powell
b79a70ab71
Merge "Add state save/restore for Toolbar" into lmp-dev
2014-08-26 01:29:15 +00:00
Adam Powell
31c91c8179
Add state save/restore for Toolbar
...
Save and restore the menu state for Toolbars. This will make sure that
we remember expanded action views and opened overflow menus across
state save/restore.
Remove an extra event post involved in the initial population of
action bar menus. Apparently at some point an extra level of this was
added that isn't necessary. Process any pending menu invalidations
immediately when we perform window state restoration. This makes sure
individual bits of state in action views, etc. are also restored
properly.
Bug 12005461
Change-Id: Icf905698576b11a59641bc319adc62300857906f
2014-08-25 18:25:54 -07:00
Robert Greenwalt
ad3fc40737
Merge "Update VPN whitelist/blacklist api docs." into lmp-dev
2014-08-26 00:58:51 +00:00
Shishir Agrawal
b2d21c21cc
Merge "Modify IccOpenLogicalChannelResponse: Document and rename constants." into lmp-dev
2014-08-26 00:58:50 +00:00
Robert Greenwalt
fc4f721a87
Update VPN whitelist/blacklist api docs.
...
Addressing what happens to unwhitelisted or blacklisted apps.
bug:17206162
Change-Id: I0b863946de277e6528675cc5412267a03f7b6841
2014-08-25 17:55:28 -07:00
Craig Mautner
1adbf22861
Merge "Update API per council requests" into lmp-dev
2014-08-26 00:00:18 +00:00
Dongwon Kang
f178c14919
Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev
2014-08-25 23:44:34 +00:00
Dongwon Kang
c88b8f8722
TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
...
Bug: 17241260
Change-Id: Ib82ed9fb98f13e31cdf70a3bb273384abcf1b33a
2014-08-26 08:41:40 +09:00
Chris Craik
366b4234ea
Merge "Create z reordering boundaries around dispatchDraw" into lmp-dev
2014-08-25 23:26:19 +00:00
Dianne Hackborn
4cce1de9fe
Merge "Fix issue #16366571 : UIDs for work and normal Chrome processes are the same" into lmp-dev
2014-08-25 23:21:48 +00:00
Alan Viverette
83a82983eb
Merge "Update material colors" into lmp-dev
2014-08-25 23:18:16 +00:00
Alan Viverette
a1fe772bd7
Update material colors
...
BUG: 17212898
Change-Id: Ic0806db57e88d5143b4241e419970ffeb2468d50
2014-08-25 16:15:06 -07:00
Robert Greenwalt
739d6dbf9b
Merge "Remove listen requests properly." into lmp-dev
2014-08-25 23:12:46 +00:00
Alan Viverette
9e05f91cee
Merge "Revert "Update shadow parameters for television."" into lmp-dev
2014-08-25 22:55:05 +00:00
Robert Greenwalt
4456cf3ff0
Remove listen requests properly.
...
https://googleplex-android-review.googlesource.com/#/c/527772/
correctly stopped adding listen requests to the mNetworkForRequestId
sparse array, but when we remove requests, if it's not getting
serviced by a network, we don't remove it from the network. That
means that when we go to send a notification for that network we have
a request affiliated with the network, but don't have data for the
request and hit this NPE.
If it's not a request, don't do the optimization and remove it only
from the network servicing the request, but instead scan all networks
and remove it from each, if found.
bug:17239054
Change-Id: I49165ed08c224ef20f703469f9ce39df5f21b163
2014-08-25 15:42:10 -07:00
Tim Murray
1df3f99d2d
Merge "Update RenderScript docs." into lmp-dev
2014-08-25 22:35:58 +00:00
Chris Craik
8afd0f245c
Create z reordering boundaries around dispatchDraw
...
bug:16012254
This means rendernodes with a Z will no longer be drawn at the end of
their parent's DisplayList, but at the end of the associated reorder
region (DisplayListData::Chunk).
Change-Id: Ia033fee9d9a4db567b2a8d5e90fc57a4d0a64544
2014-08-25 15:35:40 -07:00
John Spurlock
d38eeb5512
Merge "QS: Wire up screen casting to tile/panel." into lmp-dev
2014-08-25 22:35:25 +00:00
Alan Viverette
f707774ae1
Revert "Update shadow parameters for television."
...
Missing several important values, plus we're changing the
styling attributes so this would break anyway.
This reverts commit 97fe804398a3c6c3f7bd888f7c0129f1c130bb00.
BUG: 17221975
Change-Id: I3b4a712ca21f3821ecadfc6c9d91b604f7154f0e
2014-08-25 22:32:14 +00:00
John Reck
c1469f39b5
DO NOT MERGE Copy shaders
...
Bug: 16733996
Change-Id: I84afc1b24a23dd6ddf5ab48fb2bfcbe779f8d3e3
2014-08-25 15:27:11 -07:00
Nancy Chen
e4b1d57dfd
Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
2014-08-25 22:24:09 +00:00
Baligh Uddin
5480b3746a
am 00e4b6c5: (-s ours) am b48db445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '00e4b6c50af5d6cb38d0e0dd21e14624d65e109d':
Import translations. DO NOT MERGE
2014-08-25 22:07:59 +00:00
Baligh Uddin
5a292604eb
am 7fbc5ae8: (-s ours) am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '7fbc5ae88515362f41ff382d8e614e1225787183':
Import translations. DO NOT MERGE
2014-08-25 22:07:50 +00:00
Baligh Uddin
d15d5c8bd4
am d12be991: (-s ours) am 21281ae6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'd12be991afdaa80a556273e5ad91db2a824002c8':
Import translations. DO NOT MERGE
2014-08-25 22:07:44 +00:00
Baligh Uddin
63cdabda89
am 33a062f2: (-s ours) am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '33a062f209823a26fbc868801ba2250f331340f6':
Import translations. DO NOT MERGE
2014-08-25 22:07:40 +00:00
Aravind Akella
01a83089b7
am 303df3b6: am 765c08fd: am 611dea81: Step Counter documentation fix.
...
* commit '303df3b6ae4f6bac58012d5f14c9b764e944709b':
Step Counter documentation fix.
2014-08-25 22:07:33 +00:00
Baligh Uddin
4d4093aa12
am 90a7cbba: (-s ours) am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '90a7cbba0e9b437d4dffc1e03b2d17669a31c1b1':
Import translations. DO NOT MERGE
2014-08-25 22:07:28 +00:00
Baligh Uddin
db88184dce
am c60170b9: (-s ours) am b3024901: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c60170b96f6020f0bb501b57bd5890fbc7079ad3':
Import translations. DO NOT MERGE
2014-08-25 22:07:24 +00:00
Quddus Chong
b9fc2b4fc7
am 9893c642: am f42fdfd9: am 152cc584: Merge "docs: Added additional documentation for specifying OAuth scopes. bug: 12650251" into klp-modular-docs
...
* commit '9893c6420d0a127b3a3769a1deb2a8d397267e9b':
docs: Added additional documentation for specifying OAuth scopes. bug: 12650251
2014-08-25 22:06:39 +00:00
John Spurlock
78b8c8fbde
QS: Wire up screen casting to tile/panel.
...
Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.
Also:
- Implement hashCode/equals on MediaProjectionInfo
- Fix unintentional recursion in the service.
Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
2014-08-25 17:55:08 -04:00
Amith Yamasani
5b8e5a7d4c
Merge "Improve user switching interstitial" into lmp-dev
2014-08-25 21:43:32 +00:00