The Android Automerger
be1e46f41f
merge in lmp-release history after reset to 7d1cd4aae2
2014-08-10 06:08:54 -07:00
The Android Automerger
1c04b7d572
merge in lmp-release history after reset to 7d1cd4aae2
2014-08-09 06:09:53 -07:00
Rachad
7d1cd4aae2
Merge "Tunneled Video Playback support" into lmp-dev
2014-08-09 00:45:27 +00:00
Michael Lentine
86262fcdb4
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
...
This reverts commit 843cbb241d
.
2014-08-08 12:49:30 -07:00
Michael Lentine
45e2fc2226
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
...
This reverts commit 843cbb241d
.
2014-08-08 10:30:44 -07:00
The Android Automerger
1de31e0a95
merge in lmp-release history after reset to bb6adf0d5a
2014-08-07 06:10:00 -07:00
Brian Carlstrom
bb6adf0d5a
Merge changes Idae36efa,I6613c971 into lmp-dev
...
* changes:
Disable compilation based on vold.decrypt. [frameworks/native]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-06 23:54:36 +00:00
Brian Carlstrom
41cd9eb424
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit 538998f204
)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
2014-08-06 21:59:35 -07:00
Brian Carlstrom
9a87db6e1f
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
(cherry picked from commit cf51ba1360
)
Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
2014-08-06 21:59:32 -07:00
Brian Carlstrom
1abe557b6e
Merge "Make system use patchoat to relocate during runtime." into lmp-dev
2014-08-06 23:54:36 +00:00
Michael Wright
78f2444aaf
Revert "Revert "Add system accelerators for BACK and HOME.""
...
This reverts commit d671f98a27
.
Change-Id: Ibec48f81653bd2f755fc59a241fa7836baf53233
2014-08-06 16:59:54 -07:00
Michael Lentine
25db8dc7c6
Merge "Change output format to not throw warning on volantis." into lmp-dev
2014-08-06 23:49:20 +00:00
Michael Lentine
b54ee7704e
Change output format to not throw warning on volantis.
...
Change-Id: Id66eb61bdb1ceccfb7aefa0aa70793dac807c257
2014-08-07 14:54:23 -07:00
Michael Lentine
5af281f4ab
Fix HWComposer Surface Crop when surface is rotated
...
Bug: 15091149
Change-Id: I97ecd8af9636da9403fafdb3f9b846f95053ebb7
2014-08-07 13:44:14 -07:00
Michael Lentine
5a35059600
Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
2014-08-07 15:00:45 +00:00
Alex Light
43c5d30795
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
(cherry picked from commit 7365a10689
)
Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
2014-08-06 16:27:55 -07:00
Michael Wright
d671f98a27
Revert "Add system accelerators for BACK and HOME."
...
This reverts commit 278b525d25
.
2014-08-06 15:50:43 -07:00
Michael Wright
278b525d25
Add system accelerators for BACK and HOME.
...
Meta+Backspace -> BACK
Meta+Enter -> HOME
Bug: 14066931
Change-Id: Iff1d027300fa9911626785944a6d8efe4f62235e
2014-08-06 19:01:19 +00:00
The Android Automerger
41420ae708
merge in lmp-release history after reset to 8f3b7ce889
2014-08-06 06:09:30 -07:00
Aravind Akella
8f3b7ce889
Merge "Sensor related changes for NDK." into lmp-dev
2014-08-05 17:41:31 +00:00
Aravind Akella
b37ba399c1
Sensor related changes for NDK.
...
i) ASensorManager_getDefaultSensor returns a wake-up/non wake-up sensor
depending on the type.
ii) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
methods.
Bug : 16399898
Change-Id: I1a86fb8d9de23039fdf41679d1487e1cd761a9d0
2014-08-05 17:17:51 -07:00
Jean-Michel Trivi
e91cd213d4
AAC codec profile updates
...
Add new fields to OMX_AUDIO_PARAM_AACPROFILETYPE for
- SBR configuration
- decoder max number of channels
- decoder DRC parameters
Bug 16740915
Change-Id: Ib01822bc402fe9064c6c1c68b72c570cf72b7ecb
2014-08-05 22:34:37 +00:00
The Android Automerger
9368ebdc58
merge in lmp-release history after reset to 812e039aeb
2014-08-05 06:09:14 -07:00
Rachad
7cb0d39016
Tunneled Video Playback support
...
Added native_window_set_sideband_stream() method to Surface.[h|cpp]
Added ConfigureVideoTunnelModeParams OMX configuration structure to
HardwareAPI.h
Bug: 16132368
Change-Id: I28fa1b9dbe858d93e353e0991098cad45c626bd9
2014-08-04 21:57:22 +00:00
The Android Automerger
bc21ee5003
merge in lmp-release history after reset to a02e9484be
2014-08-04 06:08:48 -07:00
The Android Automerger
6a7b67ab55
merge in lmp-release history after reset to a02e9484be
2014-08-03 06:09:00 -07:00
The Android Automerger
e152f63968
merge in lmp-release history after reset to a02e9484be
2014-08-02 06:09:52 -07:00
Jeff Tinker
812e039aeb
Merge "Allow device to be unprovisioned" into lmp-dev
2014-08-01 13:51:29 +00:00
Jeff Tinker
bc6b9e7f8a
Allow device to be unprovisioned
...
bug: 12247651
Change-Id: Ib0ec34da708b11a95da66c353d864bb87a6616c9
2014-07-31 10:27:53 -07:00
Michael Lentine
fd9d183cd8
Build fix to use the correct source.
...
Change-Id: If36710be600dd0e15c31682e0343f281baa55627
2014-07-30 15:39:17 -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
1f6078aef7
Have VirtualDisplays send SF resize messages when resizing
...
Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
2014-07-30 11:23:44 -07: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
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
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
9ae79d869a
Build fix for size_t on 64bit.
...
Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20
2014-07-30 16:42:12 -07: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
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
The Android Automerger
436eea379c
merge in lmp-release history after reset to 03414a1cfe
2014-07-29 06:09:18 -07: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
The Android Automerger
e153a0ac3b
merge in lmp-release history after reset to d8e5e81343
2014-07-28 09:20:32 -07:00
The Android Automerger
eca8c78a16
merge in lmp-release history after reset to d8e5e81343
2014-07-27 06:08:44 -07:00
The Android Automerger
8a6c934580
merge in lmp-release history after reset to d8e5e81343
2014-07-26 06:09:48 -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