summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am a02e9484: Merge "SurfaceFlinger: Prevent deadlock by updating an atomic ↵Eric Penner2014-08-012-2/+22
|\ | | | | | | | | | | | | layer set." into lmp-dev * commit 'a02e9484be6894f8a4db7049d432f534a4e0a676': SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
| * Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." ↵Eric Penner2014-07-292-2/+22
| |\ | | | | | | | | | into lmp-dev
| | * SurfaceFlinger: Prevent deadlock by updating an atomic layer set.Eric Penner2014-07-302-2/+22
| | | | | | | | | | | | | | | | | | Bug: 12934849 Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
* | | am 68fd9e71: Merge "Sensor.cpp changes." into lmp-devAravind Akella2014-07-311-9/+48
|\ \ \ | |/ / | | | | | | | | | * commit '68fd9e71263cb16bbc4de1b5d26fbe4831480c9d': Sensor.cpp changes.
| * | Merge "Sensor.cpp changes." into lmp-devAravind Akella2014-07-301-9/+48
| |\ \
| | * | Sensor.cpp changes.Aravind Akella2014-07-311-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Rename TILT_DETECTOR 2) Set mFlags correctly for wake-up sensors. 2) Log errors for incorrect sensor flags. Change-Id: Ia449217d3b8a53353ad6b5c33c544ce37eb1de4f
* | | | am d4c3d389: Improve network connectivity dumping.Lorenzo Colitti2014-07-311-4/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd4c3d38957870fa27423dbc55d99d68772fbd490': Improve network connectivity dumping.
| * | | Improve network connectivity dumping.Lorenzo Colitti2014-07-311-4/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Explicitly dump IP addresses. Currently, some IP addresses are dumped using netcfg, but that only dumps the first IPv4 address on each interface. Instead, call ip -4 addr and ip -6 addr explicitly to dump all IPv4 and IPv6 addresses on the system. 2. Disable dumping /proc/net/{ipv6,}route, because: - We already dump all IPv4 and IPv6 routes in the tables that we use. - /proc/net/route is confusing because it only includes routes in the main table, which are all but unused. It's also in unreadable host-byte-order hex. - /proc/net/ipv6_route is confusing because it includes routes from all tables but does not say what table they are in. 3. Instead of dumping the contents of /proc/net/arp , use "ip -4 neigh show" and "ip -6 neigh show" to dump the neighbour caches for both IPv4 and IPv6. Bug: 16663736 Change-Id: Id3e509b877ab7b00eb2399b6a9868b12245da2f0
* | | am 9ae79d86: Build fix for size_t on 64bit.Michael Lentine2014-07-302-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '9ae79d869a37633fa956a4f16f3fa45b23c189f1': Build fix for size_t on 64bit.
| * | Build fix for size_t on 64bit.Michael Lentine2014-07-302-3/+3
| | | | | | | | | | | | Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20
* | | am 258ee43f: Build fix for printf with int64 and size_tMichael Lentine2014-07-301-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '258ee43fbcbc752cb08c134a12c08d5d99c4a866': Build fix for printf with int64 and size_t
| * | Build fix for printf with int64 and size_tMichael Lentine2014-07-301-2/+2
| | | | | | | | | | | | Change-Id: I642584cce7dd43e6d491a49228b0bce047d53354
* | | am fd9d183c: Build fix to use the correct source.Michael Lentine2014-07-301-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'fd9d183cd8c859ab8480dea572430398438ba8b5': Build fix to use the correct source.
| * | Build fix to use the correct source.Michael Lentine2014-07-301-1/+1
| | | | | | | | | | | | Change-Id: If36710be600dd0e15c31682e0343f281baa55627
* | | am 7306c670: Add error for format and make sure setActiveConfig fails with ↵Michael Lentine2014-07-302-3/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | an invalid mode. * commit '7306c670eb3ddb471d983a7458eb9f522afd0763': Add error for format and make sure setActiveConfig fails with an invalid mode.
| * | Add error for format and make sure setActiveConfig fails with an invalid mode.Michael Lentine2014-07-302-3/+9
| | | | | | | | | | | | Change-Id: Iacdb5cbad125787f96c64c88d432fc541c4cad1a
* | | am 47e45405: Allow for resizing of Virtual Displays.Michael Lentine2014-07-308-20/+87
|\ \ \ | |/ / | | | | | | | | | * commit '47e45405d1533aa73307014f7bf371e118695cf3': Allow for resizing of Virtual Displays.
| * | Allow for resizing of Virtual Displays.Michael Lentine2014-07-308-20/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify SurfaceFlinger to use VirtualDisplaySurface in all cases when a virtual display is used. Add functionality in VirtualDisplaySurface to resize the buffers aquired in the QueueBufferOutput. Add transaction support in SurfaceFlinger for resize. Add the modification of the size in DisplayDevice. Change-Id: Iae7e3556dc06fd18d470adbbd76f7255f6e6dd6b Tested: None
* | | am 1f6078ae: Have VirtualDisplays send SF resize messages when resizingMichael Wright2014-07-304-1/+19
|\ \ \ | |/ / | | | | | | | | | * commit '1f6078aef71b1d3f080cd565adbec350c71088dd': Have VirtualDisplays send SF resize messages when resizing
| * | Have VirtualDisplays send SF resize messages when resizingMichael Wright2014-07-304-1/+19
| | | | | | | | | | | | Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
* | | am 99c7dc59: Merge "Modified SurfaceFlinger to implment setActiveConfig and ↵Michael Lentine2014-07-306-6/+84
|\ \ \ | |/ / | | | | | | | | | | | | | | | getActiveConfig." into lmp-dev * commit '99c7dc596adeef45604a596075043e1f37daf7ca': Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
| * | Merge "Modified SurfaceFlinger to implment setActiveConfig and ↵Michael Lentine2014-07-306-6/+84
| |\ \ | | | | | | | | | | | | getActiveConfig." into lmp-dev
| | * | Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.Michael Lentine2014-07-296-6/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to change the current display mode of the device. Change-Id: Icdc3fb58389b861dc77b68102083da6f7a96eccb Tested: None (cherry picked from commit 2651fa94635a96d653038fb389a0dd827338f8d3)
* | | | am cd36eb44: Merge "Modify EGL to disconnect the window when the surface ↵Michael Lentine2014-07-302-2/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gets destroyed." into lmp-dev * commit 'cd36eb445bcc55c88e157584d9ac229280459463': Modify EGL to disconnect the window when the surface gets destroyed.
| * | | Merge "Modify EGL to disconnect the window when the surface gets destroyed." ↵Michael Lentine2014-07-252-2/+11
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | Modify EGL to disconnect the window when the surface gets destroyed.Michael Lentine2014-07-292-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
* | | | | am 330cf473: Merge "Remove WAKE_UP_* sensor constants." into lmp-devAravind Akella2014-07-291-77/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '330cf47336bc52e02a11954281486b38b3e7e6ad': Remove WAKE_UP_* sensor constants.
| * | | | Merge "Remove WAKE_UP_* sensor constants." into lmp-devAravind Akella2014-07-251-77/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove WAKE_UP_* sensor constants.Aravind Akella2014-07-281-77/+4
| | | |/ | | |/| | | | | | | | | Change-Id: I3de9d114ce82de4ed841932747d72e1f6f73c24f
* | | | am 03414a1c: Turn on support for async cursor update in surfaceflinger.Riley Andrews2014-07-288-3/+117
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '03414a1cfe6c1222fd7723949bd622f9cba145aa': Turn on support for async cursor update in surfaceflinger.
| * | | Turn on support for async cursor update in surfaceflinger.Riley Andrews2014-07-288-3/+117
| |/ / | | | | | | | | | | | | | | | | | | If available, surfaceflinger will use the hwc setCursorPositionAsync() api to change the position of supported cursor layers outside of the usual prepare/set loop. Change-Id: Ib3fc5c0c390b3489ddbba202379840a1d2748917
* | | am d8e5e813: Merge "BufferQueueProducer: fix which slot gets pre-allocated" ↵Antoine Labour2014-07-261-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-dev * commit 'd8e5e813433c5c5e4fea29a24d993b5cfe436fe0': BufferQueueProducer: fix which slot gets pre-allocated
| * | Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-devAntoine Labour2014-07-251-1/+1
| |\ \
| | * | BufferQueueProducer: fix which slot gets pre-allocatedAntoine Labour2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 78014f32da6d0ebf52fb34ebb7663863000520a0 introduced a bug that made us pre-allocate buffers into the last available free slots instead of the first available ones. This in turn caused more re-allocations, and possibly triggered driver bugs. Change-Id: Ic4a70e676b4f2bbb054bc873be62ced26e3099a0
* | | | am 524077ca: OMX: add supporting methods for flexible YUVLajos Molnar2014-07-262-0/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '524077caa6a5e5508af40cf2012d45087ed9e7f3': OMX: add supporting methods for flexible YUV
| * | | OMX: add supporting methods for flexible YUVLajos Molnar2014-07-252-0/+64
| |/ / | | | | | | | | | | | | Bug: 10706245 Change-Id: I2427930a34c468e49d3db7ba2865344f1fba2960
* | | am c268068c: Merge "SensorService performance improvements." into lmp-devAravind Akella2014-07-257-88/+332
|\ \ \ | |/ / | | | | | | | | | * commit 'c268068c55afaaa441fda903b1b84a5b5c8a0a01': SensorService performance improvements.
| * | Merge "SensorService performance improvements." into lmp-devAravind Akella2014-07-247-88/+332
| |\ \
| | * | SensorService performance improvements.Aravind Akella2014-07-247-88/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Send ack for wake_up sensors on the socket connection instead of using Binder RPC. ii) Cache events per connection in case there are write failures. Compute cache size from FIFO counts of sensors. iii) Send FlushCompleteEvent only for apps that explicitly called flush(). Change-Id: I018969736b7794b1b930529586f2294a03ee8667
* | | | am 22956874: Merge "GLProducer: Reference count images rather than buffers." ↵Eric Penner2014-07-242-194/+213
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '2295687487a0f2cc3e77915d5b0fe794d3af4d20': GLProducer: Reference count images rather than buffers.
| * | | Merge "GLProducer: Reference count images rather than buffers." into lmp-devEric Penner2014-07-242-194/+213
| |\ \ \
| | * | | GLProducer: Reference count images rather than buffers.Eric Penner2014-07-212-194/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, EGLImages can be created one-to-one with graphic buffers in slots, but that was difficult due to some special cases: - ReleaseTexImage binds a custom 'unslotted' debug image. - When all slots are freed, we still need to hang on to one. These cases were handled by keeping an additional reference to the 'current' buffer (mCurrentTextureBuf), but we would create new images since we can't reference count them in the same way. This patch uses the same semantics, except that it reference counts the image (an EglImage wrapper class) rather than just buffer. The wrapper class also detects the cases when we need a new EGLImage, and only creates them in those rare cases. Change-Id: I2915761dbe49d2a9bda1f59e60f857543634636b
* | | | | am d1ceb8b7: Install symlinks in multilib build.Ying Wang2014-07-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd1ceb8b78f4823c58185a22c5dd047c4174f91b1': Install symlinks in multilib build.
| * | | | Install symlinks in multilib build.Ying Wang2014-07-241-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c3aed1eaefa9c824d5863d58db3954eb642cffe4) Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
* | | | | am 7dc7f322: Add dumping of tombstones to dumpstate.Christopher Ferris2014-07-240-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7dc7f3221f26b771c266a26ec785eb74287922f1': Add dumping of tombstones to dumpstate.
| * | | | Add dumping of tombstones to dumpstate.Christopher Ferris2014-07-233-11/+65
| | |/ / | |/| | | | | | | | | | | | | | | | | | Dump only those tombstones modified within the last half an hour. Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
* | | | resolved conflicts for merge of e8878921 to lmp-dev-plus-aospChristopher Ferris2014-07-233-11/+65
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I930dda54336a3f6d694cec06299f09e3580671a0
| * \ \ \ Merge "Add dumping of tombstones to dumpstate."Christopher Ferris2014-07-233-11/+65
| |\ \ \ \
| | * | | | Add dumping of tombstones to dumpstate.Christopher Ferris2014-07-233-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump only those tombstones modified within the last half an hour. Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
* | | | | | am 2cbba477: add noteResetVideo/Audio to IBatteryStatsChong Zhang2014-07-232-0/+28
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '2cbba477bea136698944ece498115dbddd7bb659': add noteResetVideo/Audio to IBatteryStats