OSDN Git Service

android-x86/frameworks-native.git
9 years agoTunneled Video Playback support
Rachad [Wed, 30 Jul 2014 00:53:53 +0000 (17:53 -0700)]
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

9 years agoMerge "Allow device to be unprovisioned" into lmp-dev
Jeff Tinker [Mon, 4 Aug 2014 20:48:37 +0000 (20:48 +0000)]
Merge "Allow device to be unprovisioned" into lmp-dev

9 years agoAllow device to be unprovisioned
Jeff Tinker [Wed, 30 Apr 2014 17:21:53 +0000 (10:21 -0700)]
Allow device to be unprovisioned

bug: 12247651
Change-Id: Ib0ec34da708b11a95da66c353d864bb87a6616c9

9 years agoBuild fix to use the correct source.
Michael Lentine [Wed, 30 Jul 2014 22:39:17 +0000 (15:39 -0700)]
Build fix to use the correct source.

Change-Id: If36710be600dd0e15c31682e0343f281baa55627

9 years agoAdd error for format and make sure setActiveConfig fails with an invalid mode.
Michael Lentine [Wed, 30 Jul 2014 20:00:37 +0000 (13:00 -0700)]
Add error for format and make sure setActiveConfig fails with an invalid mode.

Change-Id: Iacdb5cbad125787f96c64c88d432fc541c4cad1a

9 years agoAllow for resizing of Virtual Displays.
Michael Lentine [Fri, 18 Jul 2014 22:34:25 +0000 (15:34 -0700)]
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

9 years agoHave VirtualDisplays send SF resize messages when resizing
Michael Wright [Thu, 26 Jun 2014 23:01:02 +0000 (16:01 -0700)]
Have VirtualDisplays send SF resize messages when resizing

Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f

9 years agoMerge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig."...
Michael Lentine [Wed, 30 Jul 2014 17:52:57 +0000 (17:52 +0000)]
Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev

9 years agoMerge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
Eric Penner [Thu, 31 Jul 2014 18:31:37 +0000 (18:31 +0000)]
Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev

9 years agoSurfaceFlinger: Prevent deadlock by updating an atomic layer set.
Eric Penner [Tue, 29 Jul 2014 02:51:58 +0000 (19:51 -0700)]
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.

Bug: 12934849

Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f

9 years agoMerge "Sensor.cpp changes." into lmp-dev
Aravind Akella [Thu, 31 Jul 2014 16:46:14 +0000 (16:46 +0000)]
Merge "Sensor.cpp changes." into lmp-dev

9 years agoSensor.cpp changes.
Aravind Akella [Tue, 29 Jul 2014 19:27:41 +0000 (12:27 -0700)]
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

9 years agoImprove network connectivity dumping.
Lorenzo Colitti [Wed, 30 Jul 2014 05:38:20 +0000 (14:38 +0900)]
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

9 years agoBuild fix for size_t on 64bit.
Michael Lentine [Wed, 30 Jul 2014 23:42:12 +0000 (16:42 -0700)]
Build fix for size_t on 64bit.

Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20

9 years agoBuild fix for printf with int64 and size_t
Michael Lentine [Wed, 30 Jul 2014 23:24:48 +0000 (16:24 -0700)]
Build fix for printf with int64 and size_t

Change-Id: I642584cce7dd43e6d491a49228b0bce047d53354

10 years agoModified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
Michael Lentine [Mon, 14 Jul 2014 20:48:55 +0000 (13:48 -0700)]
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 2651fa94635a96d653038fb389a0dd827338f8d3)

10 years agoTurn on support for async cursor update in surfaceflinger.
Riley Andrews [Tue, 1 Jul 2014 21:22:59 +0000 (14:22 -0700)]
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

10 years agoMerge "Modify EGL to disconnect the window when the surface gets destroyed." into...
Michael Lentine [Wed, 30 Jul 2014 17:19:32 +0000 (17:19 +0000)]
Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev

9 years agoModify EGL to disconnect the window when the surface gets destroyed.
Michael Lentine [Wed, 23 Jul 2014 17:19:41 +0000 (10:19 -0700)]
Modify EGL to disconnect the window when the surface gets destroyed.

Bug: 14445579

Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa

10 years agoMerge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev
Antoine Labour [Sat, 26 Jul 2014 02:05:44 +0000 (02:05 +0000)]
Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev

10 years agoBufferQueueProducer: fix which slot gets pre-allocated
Antoine Labour [Sat, 26 Jul 2014 01:14:42 +0000 (18:14 -0700)]
BufferQueueProducer: fix which slot gets pre-allocated

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

10 years agoOMX: add supporting methods for flexible YUV
Lajos Molnar [Fri, 25 Jul 2014 14:53:56 +0000 (07:53 -0700)]
OMX: add supporting methods for flexible YUV

Bug: 10706245
Change-Id: I2427930a34c468e49d3db7ba2865344f1fba2960

10 years agoMerge "Remove WAKE_UP_* sensor constants." into lmp-dev
Aravind Akella [Tue, 29 Jul 2014 19:02:00 +0000 (19:02 +0000)]
Merge "Remove WAKE_UP_* sensor constants." into lmp-dev

10 years agoRemove WAKE_UP_* sensor constants.
Aravind Akella [Tue, 29 Jul 2014 01:01:11 +0000 (18:01 -0700)]
Remove WAKE_UP_* sensor constants.

Change-Id: I3de9d114ce82de4ed841932747d72e1f6f73c24f

10 years agoMerge "SensorService performance improvements." into lmp-dev
Aravind Akella [Fri, 25 Jul 2014 18:04:57 +0000 (18:04 +0000)]
Merge "SensorService performance improvements." into lmp-dev

10 years agoSensorService performance improvements.
Aravind Akella [Thu, 10 Jul 2014 23:01:10 +0000 (16:01 -0700)]
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

10 years agoMerge "GLProducer: Reference count images rather than buffers." into lmp-dev
Eric Penner [Thu, 24 Jul 2014 19:14:50 +0000 (19:14 +0000)]
Merge "GLProducer: Reference count images rather than buffers." into lmp-dev

10 years agoInstall symlinks in multilib build.
Ying Wang [Wed, 23 Jul 2014 18:33:24 +0000 (11:33 -0700)]
Install symlinks in multilib build.

(cherry picked from commit c3aed1eaefa9c824d5863d58db3954eb642cffe4)

Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d

10 years agoAdd dumping of tombstones to dumpstate.
Christopher Ferris [Tue, 22 Jul 2014 23:08:19 +0000 (16:08 -0700)]
Add dumping of tombstones to dumpstate.

Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7

10 years agoadd noteResetVideo/Audio to IBatteryStats
Chong Zhang [Wed, 23 Jul 2014 21:47:00 +0000 (14:47 -0700)]
add noteResetVideo/Audio to IBatteryStats

Bug: 12979595
Change-Id: Ida474e539a3af0a85ec157a66bbf986430c8020e

10 years agoMerge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev
Colin Cross [Wed, 23 Jul 2014 19:56:38 +0000 (19:56 +0000)]
Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev

10 years agocrash if getNativeBuffer() called on NULL GraphicBuffer
Colin Cross [Tue, 22 Jul 2014 22:55:08 +0000 (15:55 -0700)]
crash if getNativeBuffer() called on NULL GraphicBuffer

If getNativeBuffer() is called on a NULL GraphicBuffer the
static_cast of this from GraphicBuffer* to ANativeWindowBuffer*
will return a small pointer like (ANativeWindowBuffer*)0x10.
This value can propagate past NULL checks until it causes a crash
far away from the original NULL pointer.  Crash immediately
instead.

Change-Id: Id614b9eb1484108b3c3c733545309844c4b87532

10 years agoMerge "update battery status for audio/video" into lmp-dev
Chong Zhang [Wed, 23 Jul 2014 00:02:53 +0000 (00:02 +0000)]
Merge "update battery status for audio/video" into lmp-dev

10 years agoupdate battery status for audio/video
Chong Zhang [Tue, 22 Jul 2014 16:12:21 +0000 (09:12 -0700)]
update battery status for audio/video

Bug: 12979595

Change-Id: Ic8e8d625becc6d1050f840ad63b7423f388eeba3

10 years agoBufferQueue: release mutex while allocating. DO NOT MERGE
Antoine Labour [Wed, 16 Jul 2014 04:17:03 +0000 (21:17 -0700)]
BufferQueue: release mutex while allocating. DO NOT MERGE

BufferQueueProducer::allocateBuffers used to keep the BufferQueueCore
mutex while doing the buffer allocation, which would cause the consumer
(which also needs the mutex) to block if the allocation takes a long
time.
Instead, release the mutex while doing the allocation, and grab it again
before filling the slots. Keep a bool state and a condvar to prevent
other producers from trying to allocate the slots while the mutex is
released.

Bug: 11792166

Change-Id: I4ab1319995ef892be2beba892f1fdbf50ce0416d
(cherry picked from commit ea96044470a29133321c681080870b9d31f81a19)

10 years agoGLProducer: Reference count images rather than buffers.
Eric Penner [Sat, 12 Jul 2014 02:08:04 +0000 (19:08 -0700)]
GLProducer: Reference count images rather than buffers.

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

10 years agoUse the count parameter to store all the uniform vectors, not just the first one...
Ben Clayton [Thu, 17 Jul 2014 10:10:45 +0000 (11:10 +0100)]
Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.

Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b
(cherry picked from commit 31b0aec64ba44b1ee0581e00a588d84f4b081512)

10 years agoMerge "Add OpenGL ES AEP feature xml." into lmp-dev
Jesse Hall [Mon, 21 Jul 2014 04:51:56 +0000 (04:51 +0000)]
Merge "Add OpenGL ES AEP feature xml." into lmp-dev

10 years agoAlways #include <sys/...>, not <linux/...>.
Elliott Hughes [Sat, 19 Jul 2014 00:54:09 +0000 (17:54 -0700)]
Always #include <sys/...>, not <linux/...>.

(cherry picked from commit 1e4ee9afd2de12af98dbf476b73e2d43f605384c)

Change-Id: Ie005774484f98bb33c8f867cddb778ac04a1d4ea

10 years agoFix implicit declaration of function 'prctl' in installd.
Elliott Hughes [Sat, 19 Jul 2014 00:29:15 +0000 (17:29 -0700)]
Fix implicit declaration of function 'prctl' in installd.

(cherry picked from commit ec535c5ba515f58791aa5044ba116d35a10a188e)

Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210

10 years agoAdd OpenGL ES AEP feature xml.
Jesse Hall [Fri, 18 Jul 2014 18:58:19 +0000 (11:58 -0700)]
Add OpenGL ES AEP feature xml.

Bug: 15593761
Change-Id: Ia961c64c5bf33da752518921c570c7f6dafe724e

10 years agoAdd glance gesture for doze mode.
Jeff Brown [Thu, 17 Jul 2014 22:13:55 +0000 (15:13 -0700)]
Add glance gesture for doze mode.

Change-Id: I038a706c3999200313ff5360c5ff1150ec081f08

10 years agodumpstate: fix dumping traces for vm processes on 64-bit
Colin Cross [Thu, 17 Jul 2014 02:00:46 +0000 (19:00 -0700)]
dumpstate: fix dumping traces for vm processes on 64-bit

dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote.  Change the string
matching to be prefix matching.

(cherry picked from commit 8eb25d552b07ffa799b7b61ad46d0109e7512741)

Change-Id: I6b1568161fae278f0e6107990e5b750cf0ca902b

10 years agoAdd XML files for new camera2 hardware features
Eino-Ville Talvala [Tue, 15 Jul 2014 18:05:18 +0000 (11:05 -0700)]
Add XML files for new camera2 hardware features

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8

10 years agoOffer to delete code cache directories.
Jeff Sharkey [Wed, 16 Jul 2014 04:49:51 +0000 (21:49 -0700)]
Offer to delete code cache directories.

Bug: 16187224
Change-Id: Ia860b051a34ffdfb4f6e0ea19f90cb73509c4eee

10 years agoCW on L: Fix a SIGSEGV crash in sensor service.
Sean Wan [Tue, 15 Jul 2014 00:07:33 +0000 (17:07 -0700)]
CW on L: Fix a SIGSEGV crash in sensor service.

This is to fix b/16189080.

BUG: 16189080
Change-Id: I78d44e82f797c0808891acde609040c46745a0bb

10 years agoAdd MAC for remaining service_manager functionality.
Riley Spahn [Tue, 8 Jul 2014 16:03:00 +0000 (09:03 -0700)]
Add MAC for remaining service_manager functionality.

Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.

(cherry picked from commit c67e6307cadb1f2cd876907c42d39b8374b93acd)

Change-Id: Iaf14b21346822a6b544091a0f4a9949117934b9a

10 years agoMerge "Add sticky transform to surfaceflinger." into lmp-dev
Ruben Brunk [Mon, 14 Jul 2014 22:57:34 +0000 (22:57 +0000)]
Merge "Add sticky transform to surfaceflinger." into lmp-dev

10 years agoAdd sticky transform to surfaceflinger.
Ruben Brunk [Fri, 27 Jun 2014 22:51:55 +0000 (15:51 -0700)]
Add sticky transform to surfaceflinger.

Bug: 15116722

- Adds a sticky transform field that can be set from a
  SurfaceFlinger client Surface.  This transform is
  added to any transform applied to the Surface.

Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753

10 years agodump bluedroid kernel status do not merge
Matthew Xie [Fri, 11 Jul 2014 20:58:17 +0000 (13:58 -0700)]
dump bluedroid kernel status do not merge

Change-Id: I4617f770088f86ceda2caf58bd1fdae81b3e31df
(cherry picked from commit ed3b9a09771a79b62fd4a5943d3845e7ceee6a34)

10 years agoImprove memory coherence management in screenshot code [DO NOT MERGE]
Jesse Hall [Sun, 13 Jul 2014 19:47:02 +0000 (12:47 -0700)]
Improve memory coherence management in screenshot code [DO NOT MERGE]

The existing code worked in practice, but wasn't quite correct in
theory and relied on implementation details of other code. It's still
somewhat unusual and subtle, but now is correct-in-theory (I believe)
and a little better documented.

Bug: 16044767
Change-Id: I22b01d6640f0b7beca7cbfc74981795a3218b064
(cherry picked from commit c61576794e75898a829eac52fc524c8e907b4b02)

10 years agoCompile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
Jesse Hall [Sun, 13 Jul 2014 21:37:16 +0000 (14:37 -0700)]
Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]

This is necessary to use C11/C++11 stdlib atomics, which the next
change will do. This change also fixes a couple bits of syntax that
both GCC and Clang refuse to compile in -std=c++11 mode.

Change-Id: Ia14d9d6b537a3bb106c23e19a277e48be180754c

10 years agoMerge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
Jesse Hall [Mon, 14 Jul 2014 22:35:43 +0000 (22:35 +0000)]
Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev

10 years agosurfaceflinger: Make all sources depend on Android.mk
Jesse Hall [Mon, 14 Jul 2014 22:32:59 +0000 (15:32 -0700)]
surfaceflinger: Make all sources depend on Android.mk

This forces all SurfaceFlinger sources to be recompiled when the
Makefile changes; that's overkill sometimes but makes sure everything
gets recompiled when compile options (or similar) changes.

Change-Id: I2b3c3090fc1c35078e13c77fbb1a78d447c39158

10 years agoservice_manager: check binder passed lengths
Nick Kralevich [Sat, 12 Jul 2014 23:34:01 +0000 (16:34 -0700)]
service_manager: check binder passed lengths

1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.

Bug: 15886919
Bug: 15888753

(cherry picked from commit 7d42a3c31ba78a418f9bdde0e0ab951469f321b5)

Change-Id: I1f826b88826561ea126d811c087ba30623141511

10 years agoMerge "Add HDMI-CEC feature xml."
Yuncheol Heo [Sat, 12 Jul 2014 02:15:02 +0000 (02:15 +0000)]
Merge "Add HDMI-CEC feature xml."

10 years agoRemove unnecessary code and APIs.
Sreeram Ramachandran [Sat, 12 Jul 2014 00:42:50 +0000 (17:42 -0700)]
Remove unnecessary code and APIs.

This stuff has been replaced by setNetworkForUser() in NetdClient.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f

10 years agoAdd HDMI-CEC feature xml.
Yuncheol Heo [Thu, 10 Jul 2014 11:48:23 +0000 (20:48 +0900)]
Add HDMI-CEC feature xml.

Change-Id: I51af146550cd72564e89874c867c181326d15f2c

10 years agoam 8098af6e: am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
Robin Lee [Wed, 9 Jul 2014 17:36:12 +0000 (17:36 +0000)]
am 8098af6e: am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"

* commit '8098af6ea29e9d28a6314d12963cef3107de9c18':
  Rename 'mkuser' command to 'mkuserconfig'

10 years agoam 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
Robin Lee [Wed, 9 Jul 2014 17:31:58 +0000 (17:31 +0000)]
am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"

* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
  Rename 'mkuser' command to 'mkuserconfig'

10 years agoam d441dbc6: am cbb9d0d7: Merge "Make dex2oat heap size product configurable [framewo...
Brian Carlstrom [Wed, 9 Jul 2014 15:07:38 +0000 (15:07 +0000)]
am d441dbc6: am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]"

* commit 'd441dbc6436dbf8cb13f0b784c7d16f022b7586e':
  Make dex2oat heap size product configurable [frameworks/native]

10 years agoresolved conflicts for merge of 928e05b1 to master
Sreeram Ramachandran [Wed, 9 Jul 2014 15:05:04 +0000 (08:05 -0700)]
resolved conflicts for merge of 928e05b1 to master

Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649

10 years agoam cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]"
Brian Carlstrom [Wed, 9 Jul 2014 12:36:58 +0000 (12:36 +0000)]
am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]"

* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
  Make dex2oat heap size product configurable [frameworks/native]

10 years agoam 0d2bee0c: Merge "Dump all the correct routing tables."
Sreeram Ramachandran [Wed, 9 Jul 2014 00:13:15 +0000 (00:13 +0000)]
am 0d2bee0c: Merge "Dump all the correct routing tables."

* commit '0d2bee0c0baec56ec98867d7e044602097525248':
  Dump all the correct routing tables.

10 years agoAdd ethernet feature xml.
Joe LaPenna [Tue, 8 Jul 2014 01:33:06 +0000 (18:33 -0700)]
Add ethernet feature xml.

BUG: 15143878
Change-Id: I15dbac6a7e73a94960e76669120792724fbd8acb

10 years agoam f9cfae24: Merge "Remove inline access control in service_manager."
Nick Kralevich [Mon, 7 Jul 2014 23:09:27 +0000 (23:09 +0000)]
am f9cfae24: Merge "Remove inline access control in service_manager."

* commit 'f9cfae24123bae199a07bee2dd1c307906c6e6d0':
  Remove inline access control in service_manager.

10 years agoMerge "Make dex2oat heap size product configurable [frameworks/native]"
Brian Carlstrom [Wed, 9 Jul 2014 04:07:54 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [frameworks/native]"

10 years agoMake dex2oat heap size product configurable [frameworks/native]
Brian Carlstrom [Fri, 27 Jun 2014 23:03:06 +0000 (16:03 -0700)]
Make dex2oat heap size product configurable [frameworks/native]

Bug: 15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd

10 years agoMerge "Dump all the correct routing tables."
Sreeram Ramachandran [Wed, 9 Jul 2014 00:03:35 +0000 (00:03 +0000)]
Merge "Dump all the correct routing tables."

10 years agoDump all the correct routing tables.
Sreeram Ramachandran [Tue, 8 Jul 2014 22:40:55 +0000 (15:40 -0700)]
Dump all the correct routing tables.

The list of tables is maintained in /data/misc/net/rt_tables by netd.

Change-Id: I55475c08c5e43bcf61af916210e680c47480ac32

10 years agoMerge "Rename 'mkuser' command to 'mkuserconfig'"
Robin Lee [Wed, 9 Jul 2014 17:27:09 +0000 (17:27 +0000)]
Merge "Rename 'mkuser' command to 'mkuserconfig'"

10 years agoMerge "Remove inline access control in service_manager."
Nick Kralevich [Mon, 7 Jul 2014 22:59:00 +0000 (22:59 +0000)]
Merge "Remove inline access control in service_manager."

10 years agoMerge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D...
Ben Clayton [Tue, 8 Jul 2014 09:39:01 +0000 (09:39 +0000)]
Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."

10 years agoresolved conflicts for merge of 1aa9565c to master
Nick Kralevich [Mon, 7 Jul 2014 23:27:42 +0000 (16:27 -0700)]
resolved conflicts for merge of 1aa9565c to master

Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba

10 years agoAdd data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.
Ben Clayton [Mon, 7 Jul 2014 10:50:44 +0000 (11:50 +0100)]
Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.

Change-Id: I38643f5d279a84f1b7069801d7c106fc8f1ae394

10 years agoMerge "Fix non-portable definition of CryptoPlugin::SubSample"
Jeff Tinker [Tue, 1 Jul 2014 22:34:48 +0000 (22:34 +0000)]
Merge "Fix non-portable definition of CryptoPlugin::SubSample"

10 years agoFix non-portable definition of CryptoPlugin::SubSample
Jeff Tinker [Tue, 1 Jul 2014 21:54:45 +0000 (14:54 -0700)]
Fix non-portable definition of CryptoPlugin::SubSample

bug: 16016106
Change-Id: I76514b2e7a28c86a0b0b311af575ca9dfc9471a9

10 years agoam a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat...
Brian Carlstrom [Fri, 27 Jun 2014 23:02:11 +0000 (23:02 +0000)]
am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"

* commit 'a5726eb954588bd27ffa55a5193e7c0f8bd9eac3':
  Use current max product dalvik.vm.heapsize as default dex2oat heap size

10 years agoUse current max product dalvik.vm.heapsize as default dex2oat heap size
Brian Carlstrom [Fri, 27 Jun 2014 21:15:19 +0000 (14:15 -0700)]
Use current max product dalvik.vm.heapsize as default dex2oat heap size

Bug: 15919420
Change-Id: I7ea3bbfe787026f272e50690ab3b84f894600191

10 years agoMerge "BufferQueue: Add allocateBuffers method"
Dan Stoza [Mon, 30 Jun 2014 17:38:44 +0000 (17:38 +0000)]
Merge "BufferQueue: Add allocateBuffers method"

10 years agoam 1da16ceb: am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as defaul...
Brian Carlstrom [Fri, 27 Jun 2014 23:06:41 +0000 (23:06 +0000)]
am 1da16ceb: am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"

* commit '1da16cebe65b859a5cbd961a0667267393cb333b':
  Use current max product dalvik.vm.heapsize as default dex2oat heap size

10 years agoRemove inline access control in service_manager.
Riley Spahn [Wed, 25 Jun 2014 22:15:21 +0000 (15:15 -0700)]
Remove inline access control in service_manager.

Remove the hardcoded tuples of UIDs and the services that
each is allowed to register. We will rely only on permissions
from SELinux.

Change-Id: I1c44555a6e274814282398865b30ee938f40dabb

10 years agoMerge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"
Brian Carlstrom [Fri, 27 Jun 2014 22:50:18 +0000 (22:50 +0000)]
Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"

10 years agoUse current max product dalvik.vm.heapsize as default dex2oat heap size
Brian Carlstrom [Fri, 27 Jun 2014 21:15:19 +0000 (14:15 -0700)]
Use current max product dalvik.vm.heapsize as default dex2oat heap size

Bug: 15919420

(cherry picked from commit 3aa138617b42b87069dbac0b441bd14dca2d8609)

Change-Id: I569ba111c6163e94dd1b09b21ef374f05d263e72

10 years agoGLConsumer: Allow creation in detached mode
Dan Stoza [Wed, 25 Jun 2014 21:21:45 +0000 (14:21 -0700)]
GLConsumer: Allow creation in detached mode

Adds a constructor that doesn't require a GLES texture name and sets
up the GLConsumer in detached mode.

Bug: 15616428
Change-Id: Idc9ea2e59baa24bbd959da9fffe0fb71c0aa9818

10 years agoGLConsumer: Stop using default constructor params
Dan Stoza [Tue, 24 Jun 2014 20:09:19 +0000 (13:09 -0700)]
GLConsumer: Stop using default constructor params

Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.

Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680

10 years agoam 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."
Narayan Kamath [Tue, 24 Jun 2014 12:32:45 +0000 (12:32 +0000)]
am 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."

* commit '9bc8c62ea4d86d948af7a2aade8b0b5502a84b6a':
  Exclude subdirectories when pruning the dex cache.

10 years agoam 357df19b: Merge "Exclude subdirectories when pruning the dex cache."
Narayan Kamath [Tue, 24 Jun 2014 12:13:30 +0000 (12:13 +0000)]
am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."

* commit '357df19b14b8387a480ed68dd6ea92eeb1aa4edc':
  Exclude subdirectories when pruning the dex cache.

10 years agoMerge "Exclude subdirectories when pruning the dex cache."
Narayan Kamath [Tue, 24 Jun 2014 12:07:36 +0000 (12:07 +0000)]
Merge "Exclude subdirectories when pruning the dex cache."

10 years agoBufferQueue: Add allocateBuffers method
Dan Stoza [Fri, 20 Jun 2014 20:13:57 +0000 (13:13 -0700)]
BufferQueue: Add allocateBuffers method

This adds an allocateBuffers method to BufferQueue, which instructs
it to allocate up to the maximum number of buffers allowed by the
current configuration. The goal is that this method can be called
ahead of render time, which will prevent dequeueBuffers from blocking
in allocation and inducing jank.

This interface is also plumbed up to the native Surface (and, in
another change, up to the Java Surface and ThreadedRenderer).

Bug: 11792166
Change-Id: I4aa96b4351ea1c95ed5db228ca3ef98303229c74

10 years agoUse openssl's SHA1 instead of bionic's.
Dan Albert [Tue, 17 Jun 2014 00:31:28 +0000 (17:31 -0700)]
Use openssl's SHA1 instead of bionic's.

Bionic is removing its SHA1.

Change-Id: I7d15986ebac9e0f0eb7ff93457780bd90a4f1d4f

10 years agoExclude subdirectories when pruning the dex cache.
Narayan Kamath [Tue, 17 Jun 2014 11:54:16 +0000 (12:54 +0100)]
Exclude subdirectories when pruning the dex cache.

This requires a companion package manager change to prune
each instruction specific dex cache individually.

bug: 15677279

Change-Id: I5891981512bde20e49bff65b1842c28886f2b177

10 years agoMerge "SurfaceFlinger: send VSYNC power hints to IPowerManager"
Ruchi Kandoi [Fri, 20 Jun 2014 17:07:04 +0000 (17:07 +0000)]
Merge "SurfaceFlinger: send VSYNC power hints to IPowerManager"

10 years agoSurfaceFlinger: send VSYNC power hints to IPowerManager
Ruchi Kandoi [Wed, 2 Apr 2014 19:50:06 +0000 (12:50 -0700)]
SurfaceFlinger: send VSYNC power hints to IPowerManager

VSYNC power hints are now sent via binder to IPowerManager.
SurfaceFlinger no longer loads a second copy of the PowerHAL.
VSYNC power hints are sent in batches and not on per frame basis.

Change-Id: Ia5a839ab3c857cffae7089f810b4315d4ed23fcf

10 years agoMerge "SurfaceFlinger: Fix rect out-of-bounds checks"
Dan Stoza [Thu, 19 Jun 2014 17:46:47 +0000 (17:46 +0000)]
Merge "SurfaceFlinger: Fix rect out-of-bounds checks"

10 years agoMerge "Add two new display info fields"
Andy McFadden [Wed, 18 Jun 2014 14:22:26 +0000 (14:22 +0000)]
Merge "Add two new display info fields"

10 years agoam 724473b3: am 71f9956a: Merge "Fix obsolete argument name"
Brian Carlstrom [Tue, 17 Jun 2014 20:05:05 +0000 (20:05 +0000)]
am 724473b3: am 71f9956a: Merge "Fix obsolete argument name"

* commit '724473b359d63bf707bd1fe04abdc82edc5fd22d':
  Fix obsolete argument name

10 years agoam 71f9956a: Merge "Fix obsolete argument name"
Brian Carlstrom [Tue, 17 Jun 2014 20:00:17 +0000 (20:00 +0000)]
am 71f9956a: Merge "Fix obsolete argument name"

* commit '71f9956a23885e64626828a1afa8c512e29be8cc':
  Fix obsolete argument name

10 years agoAdd two new display info fields
Andy McFadden [Fri, 13 Jun 2014 21:04:23 +0000 (14:04 -0700)]
Add two new display info fields

This adds SurfaceFlinger's app VSYNC offset and buffer deadline
values to DisplayInfo.

Bug 14612039

Change-Id: Ie0ab21d388fe2764f2b6f71bd1cefa33dc861a73

10 years agoMerge "Fix obsolete argument name"
Brian Carlstrom [Tue, 17 Jun 2014 19:51:37 +0000 (19:51 +0000)]
Merge "Fix obsolete argument name"