Brian Carlstrom
755d35f5fa
am 74b3ecf4
: Merge "Disable compilation based on vold.decrypt. [frameworks/native]"
...
* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
Disable compilation based on vold.decrypt. [frameworks/native]
2014-08-04 18:37:31 +00:00
Brian Carlstrom
6461ddb4e1
am 9c49e21d
: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]"
...
* commit '9c49e21d80cb55b7d77fdf118f06b88100141678':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-04 18:37:26 +00:00
Eric Penner
3367a960ab
am a02e9484
: Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
...
* commit 'a02e9484be6894f8a4db7049d432f534a4e0a676':
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
2014-08-01 13:48:37 +00:00
Brian Carlstrom
74b3ecf485
Merge "Disable compilation based on vold.decrypt. [frameworks/native]"
2014-08-01 08:22:51 +00:00
Brian Carlstrom
538998f204
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
2014-08-04 11:25:45 -07:00
Brian Carlstrom
9c49e21d80
Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]"
2014-08-01 01:50:59 +00:00
Aravind Akella
856ee46efd
am 68fd9e71
: Merge "Sensor.cpp changes." into lmp-dev
...
* commit '68fd9e71263cb16bbc4de1b5d26fbe4831480c9d':
Sensor.cpp changes.
2014-07-31 16:55:59 +00:00
Lorenzo Colitti
414038acf3
am d4c3d389
: Improve network connectivity dumping.
...
* commit 'd4c3d38957870fa27423dbc55d99d68772fbd490':
Improve network connectivity dumping.
2014-07-31 02:04:20 +00:00
Lorenzo Colitti
d4c3d38957
Improve network connectivity dumping.
...
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
2014-07-31 01:56:12 +00:00
Michael Lentine
45500a2512
am 9ae79d86
: Build fix for size_t on 64bit.
...
* commit '9ae79d869a37633fa956a4f16f3fa45b23c189f1':
Build fix for size_t on 64bit.
2014-07-30 23:51:11 +00:00
Michael Lentine
9ae79d869a
Build fix for size_t on 64bit.
...
Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20
2014-07-30 16:42:12 -07:00
Aravind Akella
68fd9e7126
Merge "Sensor.cpp changes." into lmp-dev
2014-07-30 23:34:26 +00:00
Aravind Akella
64ffcb0944
Sensor.cpp changes.
...
1) Rename TILT_DETECTOR
2) Set mFlags correctly for wake-up sensors.
2) Log errors for incorrect sensor flags.
Change-Id: Ia449217d3b8a53353ad6b5c33c544ce37eb1de4f
2014-07-31 09:40:03 -07:00
Michael Lentine
82afbd1eeb
am 258ee43f
: Build fix for printf with int64 and size_t
...
* commit '258ee43fbcbc752cb08c134a12c08d5d99c4a866':
Build fix for printf with int64 and size_t
2014-07-30 23:33:45 +00:00
Michael Lentine
258ee43fbc
Build fix for printf with int64 and size_t
...
Change-Id: I642584cce7dd43e6d491a49228b0bce047d53354
2014-07-30 16:24:48 -07:00
Michael Lentine
134c268764
am fd9d183c
: Build fix to use the correct source.
...
* commit 'fd9d183cd8c859ab8480dea572430398438ba8b5':
Build fix to use the correct source.
2014-07-30 22:49:02 +00:00
Michael Lentine
fd9d183cd8
Build fix to use the correct source.
...
Change-Id: If36710be600dd0e15c31682e0343f281baa55627
2014-07-30 15:39:17 -07:00
Michael Lentine
7a35ea2c8d
am 7306c670
: Add error for format and make sure setActiveConfig fails with an invalid mode.
...
* commit '7306c670eb3ddb471d983a7458eb9f522afd0763':
Add error for format and make sure setActiveConfig fails with an invalid mode.
2014-07-30 22:25:08 +00:00
Michael Lentine
60ac446e9e
am 47e45405
: Allow for resizing of Virtual Displays.
...
* commit '47e45405d1533aa73307014f7bf371e118695cf3':
Allow for resizing of Virtual Displays.
2014-07-30 22:25:07 +00:00
Brian Carlstrom
cf51ba1360
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
2014-07-30 14:36:35 -07:00
Michael Lentine
7306c670eb
Add error for format and make sure setActiveConfig fails with an invalid mode.
...
Change-Id: Iacdb5cbad125787f96c64c88d432fc541c4cad1a
2014-07-30 14:36:25 -07:00
Michael Lentine
47e45405d1
Allow for resizing of Virtual Displays.
...
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
2014-07-30 14:36:25 -07:00
Michael Wright
57d730041d
am 1f6078ae
: Have VirtualDisplays send SF resize messages when resizing
...
* commit '1f6078aef71b1d3f080cd565adbec350c71088dd':
Have VirtualDisplays send SF resize messages when resizing
2014-07-30 21:34:46 +00:00
Michael Wright
1f6078aef7
Have VirtualDisplays send SF resize messages when resizing
...
Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
2014-07-30 11:23:44 -07:00
Michael Lentine
9a7c0615e5
am 99c7dc59
: Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev
...
* commit '99c7dc596adeef45604a596075043e1f37daf7ca':
Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
2014-07-30 18:03:04 +00:00
Michael Lentine
63c80705e8
am cd36eb44
: Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev
...
* commit 'cd36eb445bcc55c88e157584d9ac229280459463':
Modify EGL to disconnect the window when the surface gets destroyed.
2014-07-30 17:30:48 +00:00
Michael Lentine
99c7dc596a
Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev
2014-07-30 16:17:51 +00:00
Eric Penner
a02e9484be
Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
2014-07-29 21:36:00 +00:00
Eric Penner
51c59cd1e7
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
...
Bug: 12934849
Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
2014-07-30 19:05:38 -07:00
Aravind Akella
2981b36e51
am 330cf473
: Merge "Remove WAKE_UP_* sensor constants." into lmp-dev
...
* commit '330cf47336bc52e02a11954281486b38b3e7e6ad':
Remove WAKE_UP_* sensor constants.
2014-07-29 19:13:26 +00:00
Michael Lentine
6c9e34a98a
Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
...
This can be used to change the current display mode of the device.
Change-Id: Icdc3fb58389b861dc77b68102083da6f7a96eccb
Tested: None
(cherry picked from commit 2651fa9463
)
2014-07-29 16:56:30 +00:00
Riley Andrews
2c16ba8cc1
am 03414a1c
: Turn on support for async cursor update in surfaceflinger.
...
* commit '03414a1cfe6c1222fd7723949bd622f9cba145aa':
Turn on support for async cursor update in surfaceflinger.
2014-07-28 23:58:30 +00:00
Riley Andrews
03414a1cfe
Turn on support for async cursor update in surfaceflinger.
...
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
2014-07-28 22:07:41 +00:00
Antoine Labour
bd7b9443d9
am d8e5e813
: Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev
...
* commit 'd8e5e813433c5c5e4fea29a24d993b5cfe436fe0':
BufferQueueProducer: fix which slot gets pre-allocated
2014-07-26 02:14:08 +00:00
Lajos Molnar
a0c3a207b5
am 524077ca
: OMX: add supporting methods for flexible YUV
...
* commit '524077caa6a5e5508af40cf2012d45087ed9e7f3':
OMX: add supporting methods for flexible YUV
2014-07-26 02:00:40 +00:00
Lajos Molnar
524077caa6
OMX: add supporting methods for flexible YUV
...
Bug: 10706245
Change-Id: I2427930a34c468e49d3db7ba2865344f1fba2960
2014-07-25 18:06:37 -07:00
Michael Lentine
cd36eb445b
Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev
2014-07-25 21:16:23 +00:00
Michael Lentine
843cbb241d
Modify EGL to disconnect the window when the surface gets destroyed.
...
Bug: 14445579
Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
2014-07-29 18:59:56 -07:00
Antoine Labour
d8e5e81343
Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev
2014-07-25 21:16:23 +00:00
Antoine Labour
11f14871db
BufferQueueProducer: fix which slot gets pre-allocated
...
Commit 78014f32da
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
2014-07-25 18:47:25 -07:00
Aravind Akella
330cf47336
Merge "Remove WAKE_UP_* sensor constants." into lmp-dev
2014-07-25 21:16:23 +00:00
Aravind Akella
fd8498c41e
Remove WAKE_UP_* sensor constants.
...
Change-Id: I3de9d114ce82de4ed841932747d72e1f6f73c24f
2014-07-28 18:01:11 -07:00
Aravind Akella
6f3a236f56
am c268068c
: Merge "SensorService performance improvements." into lmp-dev
...
* commit 'c268068c55afaaa441fda903b1b84a5b5c8a0a01':
SensorService performance improvements.
2014-07-25 19:11:59 +00:00
Eric Penner
0c92547d87
am 22956874
: Merge "GLProducer: Reference count images rather than buffers." into lmp-dev
...
* commit '2295687487a0f2cc3e77915d5b0fe794d3af4d20':
GLProducer: Reference count images rather than buffers.
2014-07-24 23:34:09 +00:00
Ying Wang
82a93225a0
am d1ceb8b7
: Install symlinks in multilib build.
...
* commit 'd1ceb8b78f4823c58185a22c5dd047c4174f91b1':
Install symlinks in multilib build.
2014-07-24 23:32:37 +00:00
Christopher Ferris
06ad7bf518
am 7dc7f322
: Add dumping of tombstones to dumpstate.
...
* commit '7dc7f3221f26b771c266a26ec785eb74287922f1':
Add dumping of tombstones to dumpstate.
2014-07-24 19:48:11 +00:00
Ying Wang
d1ceb8b78f
Install symlinks in multilib build.
...
(cherry picked from commit c3aed1eaef
)
Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
2014-07-24 10:36:55 -07:00
Aravind Akella
c268068c55
Merge "SensorService performance improvements." into lmp-dev
2014-07-24 15:37:54 +00:00
Aravind Akella
56ae42613c
SensorService performance improvements.
...
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
2014-07-24 17:23:01 -07:00
Eric Penner
2295687487
Merge "GLProducer: Reference count images rather than buffers." into lmp-dev
2014-07-24 15:36:21 +00:00