148792 Commits

Author SHA1 Message Date
ztenghui
bed17d21b0 Merge "Correctly detect the wrong Z value for the light" into lmp-dev 2014-08-26 18:18:31 +00:00
ztenghui
ae82e604fa Merge "VD: Update the fillColor default as transparent" into lmp-dev 2014-08-26 18:18:16 +00:00
Georgi Nikolov
ffc596bd22 Merge "Add maximum time-out to sync operation" into lmp-dev 2014-08-26 18:16:54 +00:00
Georgi Nikolov
1877924da0 Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev 2014-08-26 18:13:14 +00:00
ztenghui
3bd3fa1f1d Correctly detect the wrong Z value for the light
b/17221975

Change-Id: I2b46da95ad12ca5260d7fe9514a75558b6b6393b
2014-08-26 10:45:27 -07:00
Craig Mautner
e7b1a0b68c Merge "Remove redundant call to window manager addTask()" into lmp-dev 2014-08-26 17:29:17 +00:00
Christoph Studer
38db384424 Merge "SysUI: Force L+ status bar icons to white" into lmp-dev 2014-08-26 17:13:39 +00:00
Adam Lesinski
d691f31e51 Merge "Introduce anydpi density resource qualifier" into lmp-dev 2014-08-26 17:03:44 +00:00
Christoph Studer
13b895125c SysUI: Force L+ status bar icons to white
Bug: 16862480
Change-Id: I13126e4641563953d00b8e1b8324b470b9fc085c
2014-08-26 18:51:36 +02:00
Mohamad Ayyash
412e4e203f Merge "Set text color for the output log." into lmp-dev 2014-08-26 16:44:28 +00:00
Vinod Krishnan
51f6f52d9d Merge "Fwk: Adding an ECG hardware feature" into lmp-dev 2014-08-26 16:37:33 +00:00
Nicolas Prevot
1ce1ba68ac Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev 2014-08-26 16:29:20 +00:00
Esteban Talavera
75b3fafe9e Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev 2014-08-26 15:58:36 +00:00
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
Esteban Talavera
fbb28dfb95 Revert API constants to previous value to match hardcoded value in google3 apps
Revert value of DevicePolicyManager constants that were hardcoded in dmagent. See previous change I6f60a43fe23526cfe855d81015feb759cf643926.

Bug: 17275391,17005622
Change-Id: I606b010eb0399f7b34b59c99f96549949410bafc
2014-08-26 15:38:44 +01: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
Mohamad Ayyash
c508d03a94 Set text color for the output log.
In some devices the text color is the same as the background color.

Change-Id: I215d381a427e3b3ed7e29d3078752d093318b53d
2014-08-25 19:27:57 -07:00
Matthew Williams
92a1c09aa4 Add maximum time-out to sync operation
BUG: 16219182
We have seen cases where run-away syncs keep going for a very long time.
The default behaviour is that a sync can run for as long as it wants once
there is nothing else waiting.
This CL will change that, and impose a maximum time-limit of 30mins on
each sync, after when the op with be cancelled and the adapter will go
into back-off.
This behaviour will only take effect for syncs that are not initializations,
or user-initiated.

Change-Id: I1731270ca2a6500b19fc125186aa0b0cd81d1126
2014-08-25 19:25:55 -07: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
Matthew Williams
3c8a42ddd9 Don't back-off ALREADY_IN_PROGRESS syncs
BUG: 16219182
The issue is that some adapters get into a bad state where
SyncManager assumes them complete yet they are still going. This
result in ALREADY_IN_PROGRESS coming back from the adapter, the
default retry-time for which is about 10s.
Subject ALREADY_IN_PROGRESS to exponential back-off to avoid waking
up SM every ~10 seconds

Change-Id: I6cef787366436c678bac762ec6daf6212f04badc
2014-08-25 18:09:41 -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
Adam Lesinski
31245b4f06 Introduce anydpi density resource qualifier
This is meant to be used with scaleable vector
drawables, and are chosen as the best match unless
there is a configuration that matches the density
requested exactly.

Bug:17007265
Change-Id: Ic3288d0236fe0bff20bb1599aba2582c25b0db32
2014-08-25 17:47:30 -07:00
Craig Mautner
1adbf22861 Merge "Update API per council requests" into lmp-dev 2014-08-26 00:00:18 +00:00
Craig Mautner
79323120dd Remove redundant call to window manager addTask()
If there are activities in persisted tasks then calling addAppToken()
will automatically call addTask(). If there are no activities then
calling addTask() is a nop. In either case the call to addTask() is
unnecessary. It was actually worse than unnecessary because in the
former case we ended up with two identical tasks in the Window
Manager.

Fixes bug 16958544.

Change-Id: I2dc4b50aa94668873c1a783c47e0c696d62616f0
2014-08-25 16:56:52 -07: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