OSDN Git Service
Jeff Brown [Wed, 18 Feb 2015 02:17:08 +0000 (02:17 +0000)]
am
c9aa628d: Cancel touch events when a low-level touch gesture occurs.
* commit '
c9aa628d065eb08d6fa30f0ac21c6eca4cfbab75':
Cancel touch events when a low-level touch gesture occurs.
Elliott Hughes [Tue, 17 Feb 2015 01:38:59 +0000 (01:38 +0000)]
am
75b81aee: Merge "Add missing <sys/file.h> include for flock."
* commit '
75b81aee3830d0a8c7c10e3ca7f1652543dbbaca':
Add missing <sys/file.h> include for flock.
Elliott Hughes [Tue, 17 Feb 2015 01:24:48 +0000 (01:24 +0000)]
Merge "Add missing <sys/file.h> include for flock."
Elliott Hughes [Mon, 16 Feb 2015 18:44:22 +0000 (10:44 -0800)]
Add missing <sys/file.h> include for flock.
Change-Id: I5c9bb4aa74d8a36d44e086bbcb5d60876727ce4c
Jeff Brown [Thu, 12 Feb 2015 03:03:28 +0000 (19:03 -0800)]
Cancel touch events when a low-level touch gesture occurs.
When the touch firmware or driver sends a key event that is triggered
by a low-level gesture such as a palm slap. For this to work, the
touch device's .kl file must specify the "GESTURE" flag for each
key that is produced by a gesture.
Note that the "VIRTUAL" flag should also be specified for any such
keys for which we would like to generate haptic feedback.
eg. key 142 SLEEP VIRTUAL GESTURE
Bug:
19264992
Change-Id: Ief494ec7e3ca66d2358a1001fdfae4f263ee1cd1
Nick Vaccaro [Wed, 11 Feb 2015 20:04:42 +0000 (20:04 +0000)]
am
b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
* commit '
b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Lajos Molnar [Wed, 11 Feb 2015 20:04:40 +0000 (20:04 +0000)]
am
9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"
* commit '
9b6be8e10b25f6f0bb949fec67b36fc773f5b591':
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
Nick Vaccaro [Wed, 11 Feb 2015 19:58:18 +0000 (19:58 +0000)]
Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
Lajos Molnar [Wed, 11 Feb 2015 17:58:06 +0000 (09:58 -0800)]
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
This reverts commit
61b17d64f90b85fd367ea1c7609cac69485957d4.
Bug:
19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
Christopher Ferris [Tue, 10 Feb 2015 16:53:52 +0000 (16:53 +0000)]
am
8511b3ae: Merge "Remove -z option."
* commit '
8511b3ae5eb42810f97f7c3e993d7f80d3393b83':
Remove -z option.
Christopher Ferris [Tue, 10 Feb 2015 01:26:58 +0000 (01:26 +0000)]
Merge "Remove -z option."
Christopher Ferris [Tue, 10 Feb 2015 00:24:47 +0000 (16:24 -0800)]
Remove -z option.
This option doesn't work with the current selinux protections and
doesn't serve much of a purpose. You can get the same results running
this:
dumpstate | gzip > /data/local/tmp/dump.txt.gz
Bug:
19271141
Change-Id: Icc76200df33dc708e30c556ec8a0f393f995fe7c
Nick Vaccaro [Wed, 21 Jan 2015 23:27:23 +0000 (15:27 -0800)]
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Change-Id: I7e5516de805618df41de0f9b06805002e32708c3
Lajos Molnar [Sat, 7 Feb 2015 00:06:07 +0000 (00:06 +0000)]
am
d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
* commit '
d25be0ea48c775e4038163b546c9553e294d4fdc':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
Lajos Molnar [Fri, 6 Feb 2015 02:37:56 +0000 (18:37 -0800)]
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar,
but used under this value on some devices.
Bug:
19246722
Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1
Lajos Molnar [Wed, 4 Feb 2015 20:47:43 +0000 (20:47 +0000)]
am
ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams
* commit '
ea5da67d90647a1d4b395be51bf9cec218b98b71':
add bUsingNativeBuffers to DescribeColorFormatParams
Christopher Ferris [Wed, 4 Feb 2015 02:08:44 +0000 (02:08 +0000)]
am
50ad67e4: Merge "Add better timeout mechanism for running commands."
* commit '
50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
Add better timeout mechanism for running commands.
Christopher Ferris [Wed, 4 Feb 2015 01:57:13 +0000 (01:57 +0000)]
Merge "Add better timeout mechanism for running commands."
Christopher Ferris [Fri, 30 Jan 2015 19:00:52 +0000 (11:00 -0800)]
Add better timeout mechanism for running commands.
Change-Id: I60fc9e7d59c3e0e4b8b2f69f79c6903240bfd131
Elliott Hughes [Fri, 30 Jan 2015 21:16:38 +0000 (21:16 +0000)]
am
51bfedd8: Merge "Add missing includes."
* commit '
51bfedd821c79ae34ee1caffd9ae958faa71ecec':
Add missing includes.
Lajos Molnar [Fri, 30 Jan 2015 18:36:11 +0000 (10:36 -0800)]
add bUsingNativeBuffers to DescribeColorFormatParams
This is needed to find proper color format for flex-YUV native
buffer support.
Bug:
19179927
Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942
Elliott Hughes [Fri, 30 Jan 2015 06:34:37 +0000 (06:34 +0000)]
Merge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 06:32:32 +0000 (22:32 -0800)]
Add missing includes.
Change-Id: I1dad32ab459c25063a70cf52100a29d00fea3a90
Lajos Molnar [Thu, 29 Jan 2015 08:41:35 +0000 (08:41 +0000)]
am
94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
* commit '
94ee9b5916903e6ee23bb1ce8f688900a4eb6f65':
CpuConsumer: lock buffers that could be YUV as ycbcr
Lajos Molnar [Thu, 29 Jan 2015 07:53:57 +0000 (07:53 +0000)]
Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
Lajos Molnar [Thu, 29 Jan 2015 05:27:46 +0000 (21:27 -0800)]
resolved conflicts for merge of
1f9f71e1 to lmp-mr1-dev-plus-aosp
Change-Id: I627e58fe738e9a3b9831508853f26f9adc350f90
Lajos Molnar [Fri, 23 Jan 2015 00:37:37 +0000 (16:37 -0800)]
CpuConsumer: lock buffers that could be YUV as ycbcr
Bug:
17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
Lajos Molnar [Thu, 29 Jan 2015 00:16:40 +0000 (16:16 -0800)]
GraphicBufferMapper: handle devices that do not implement lock_ycbcr
Bug:
19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
Michael Lentine [Wed, 28 Jan 2015 22:38:42 +0000 (22:38 +0000)]
am
d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
* commit '
d6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8':
Remove lock around ref count check in terminate.
Michael Lentine [Wed, 28 Jan 2015 22:23:05 +0000 (22:23 +0000)]
Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
Michael Lentine [Tue, 27 Jan 2015 17:01:03 +0000 (09:01 -0800)]
Remove lock around ref count check in terminate.
Replace the global lock in terminate for the ref count check with atomics and a
local lock.
Bug:
19072064
Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
Elliott Hughes [Wed, 28 Jan 2015 17:34:16 +0000 (17:34 +0000)]
am
0e17a265: Merge "Switch dumpstate to "ip link list"."
* commit '
0e17a265f5e8bf233a3e3b74fc03ada3dc467bed':
Switch dumpstate to "ip link list".
Elliott Hughes [Wed, 28 Jan 2015 17:22:27 +0000 (17:22 +0000)]
Merge "Switch dumpstate to "ip link list"."
Elliott Hughes [Wed, 28 Jan 2015 04:48:52 +0000 (20:48 -0800)]
Switch dumpstate to "ip link list".
Change-Id: Ia1db51c866890f09fbd4316764dea5982554598f
Dan Stoza [Tue, 27 Jan 2015 20:06:33 +0000 (20:06 +0000)]
Merge "resolved conflicts for merge of
1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Yabin Cui [Tue, 27 Jan 2015 19:56:06 +0000 (19:56 +0000)]
am
6e32c037: Merge "Kill HAVE_PTHREADS."
* commit '
6e32c0377db89bafa477715b3a02431d651978cf':
Kill HAVE_PTHREADS.
Dan Stoza [Tue, 27 Jan 2015 19:49:03 +0000 (11:49 -0800)]
resolved conflicts for merge of
1665c8e1 to lmp-mr1-dev-plus-aosp
Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608
Yabin Cui [Tue, 27 Jan 2015 19:46:54 +0000 (19:46 +0000)]
Merge "Kill HAVE_PTHREADS."
Dan Stoza [Tue, 27 Jan 2015 18:32:10 +0000 (10:32 -0800)]
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
This reverts commit
03eccb6616744c3789b6018680de7bf5a18f71ce.
Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
Yabin Cui [Tue, 27 Jan 2015 03:45:47 +0000 (19:45 -0800)]
Kill HAVE_PTHREADS.
Bug:
19083585
Change-Id: I355491de945590f43c82bdcb7968b01b4bff6e06
Jesse Hall [Mon, 26 Jan 2015 17:39:55 +0000 (17:39 +0000)]
am
a46ff664: Merge "Use register numbers instead of register names"
* commit '
a46ff664571465b7a2741bed4225d30b5bf07503':
Use register numbers instead of register names
Jesse Hall [Mon, 26 Jan 2015 17:17:08 +0000 (17:17 +0000)]
Merge "Use register numbers instead of register names"
Elliott Hughes [Sun, 25 Jan 2015 20:43:27 +0000 (20:43 +0000)]
am
346329b7: Merge "Move atrace from the obsolete bzero to memset."
* commit '
346329b7a70b594895be0aec5dc00f9f4108b533':
Move atrace from the obsolete bzero to memset.
Elliott Hughes [Sun, 25 Jan 2015 19:17:14 +0000 (19:17 +0000)]
Merge "Move atrace from the obsolete bzero to memset."
Elliott Hughes [Sun, 25 Jan 2015 16:35:20 +0000 (08:35 -0800)]
Move atrace from the obsolete bzero to memset.
(This file wasn't including <strings.h> for bzero or <string.h> for memset.)
Change-Id: Icef0e0dbfd36ebd21058cfd8c747e0a17aee8308
Christopher Ferris [Fri, 23 Jan 2015 23:12:16 +0000 (23:12 +0000)]
am
c0e10c6f: Merge "Refactor of the bugreport code."
* commit '
c0e10c6f03eaa126aeb745e0b209ad0b219ade6e':
Refactor of the bugreport code.
Christopher Ferris [Fri, 23 Jan 2015 23:01:28 +0000 (23:01 +0000)]
Merge "Refactor of the bugreport code."
Christopher Ferris [Wed, 21 Jan 2015 03:18:59 +0000 (19:18 -0800)]
Refactor of the bugreport code.
Implemented these changes:
- Make this code C++.
- Avoid hangs by adding a timeout.
- Add the necessary TEMP_FAILURE_RETRY calls.
- Restructure the code a bit.
Bug:
18800936
Change-Id: Iba9f86a4c7beee4f0f36e51234855f4c0834db47
Jesse Hall [Thu, 22 Jan 2015 18:50:55 +0000 (18:50 +0000)]
am
f551e1c1: Merge "[MIPS] Further opengl support for mips64 and mipsr6"
* commit '
f551e1c1a59ae7ac906e2b204c3704d0dbf926a8':
[MIPS] Further opengl support for mips64 and mipsr6
Jesse Hall [Thu, 22 Jan 2015 16:55:04 +0000 (16:55 +0000)]
Merge "[MIPS] Further opengl support for mips64 and mipsr6"
Dan Stoza [Thu, 22 Jan 2015 01:36:06 +0000 (17:36 -0800)]
libui: Add Rect(uint32_t, uint32_t)
Adds a Rect constructor that takes uint32_t instead of int32_t, as
required by a change to Region and -Werror
Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
Dan Stoza [Thu, 22 Jan 2015 00:13:22 +0000 (00:13 +0000)]
am
4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"
* commit '
4ecf6ec932644b680d5e13791275dd3bc1a1ee6d':
Restore Region::set(uint32_t, uint32_t)
Dan Stoza [Wed, 21 Jan 2015 16:39:22 +0000 (16:39 +0000)]
Merge "Restore Region::set(uint32_t, uint32_t)"
Nikola Veljkovic [Fri, 26 Dec 2014 16:33:14 +0000 (17:33 +0100)]
Use register numbers instead of register names
Avoid ambiguity by using register numbers. Register names are
interpreted depending on the ABI. Fixes the issue with mips64 gcc,
where registers t0-t4 are translated into $8-$11 (o32 ABI) instead
of $12-$15 (o64 ABI).
Also, use t9 ($25) for storing function address
(in getProcAddress.cpp).
Change-Id: I12ef5cd98bf14dab3c01f2756889cc02856c1cd8
Duane Sand [Wed, 26 Nov 2014 21:17:40 +0000 (13:17 -0800)]
[MIPS] Further opengl support for mips64 and mipsr6
Combines 4 patches by Dragoslav and Douglas:
Use t9 to hold the address of the called function.
Add support for gl binding.
Fix inline assembly code to be R6 compatible.
Fix some more inline assembly code to be R6 compatible.
Change-Id: I0b899813790b2ba4ca538bb21692014cc1933f66
Dan Stoza [Sat, 17 Jan 2015 00:50:53 +0000 (00:50 +0000)]
am
ef1c17ae: SurfaceFlinger: Make log message 64-bit compatible
* commit '
ef1c17ae9417abc1e21e49dbc629e448efc947dc':
SurfaceFlinger: Make log message 64-bit compatible
Dan Stoza [Sat, 17 Jan 2015 00:18:51 +0000 (16:18 -0800)]
resolved conflicts for merge of
03eccb66 to lmp-mr1-dev-plus-aosp
Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
Dan Stoza [Fri, 16 Jan 2015 23:58:13 +0000 (15:58 -0800)]
SurfaceFlinger: Make log message 64-bit compatible
Fixes the build on 64-bit targets that complain about using a size_t
with a %d in a format string
Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
Dan Stoza [Fri, 16 Jan 2015 22:13:46 +0000 (14:13 -0800)]
SurfaceFlinger: Attempt to attribute fds to layers
This tracks fds when layers are created and destroyed in an effort to
determine which specific app (if any) is active when fds are leaked
Bug:
19017008
Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
Jeff Sharkey [Fri, 16 Jan 2015 06:07:31 +0000 (06:07 +0000)]
am
8f3ade0c: Merge "Follow StrictMode refactoring."
* commit '
8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
Follow StrictMode refactoring.
Jeff Sharkey [Fri, 16 Jan 2015 01:10:51 +0000 (01:10 +0000)]
Merge "Follow StrictMode refactoring."
Christopher Ferris [Thu, 15 Jan 2015 23:51:57 +0000 (23:51 +0000)]
am
1d463883: Merge "Use the timeout stack dump functions."
* commit '
1d4638838aa09b157a68cb3580b8194f8736b880':
Use the timeout stack dump functions.
Christopher Ferris [Thu, 15 Jan 2015 23:40:39 +0000 (23:40 +0000)]
Merge "Use the timeout stack dump functions."
Christopher Ferris [Wed, 14 Jan 2015 21:23:30 +0000 (13:23 -0800)]
Use the timeout stack dump functions.
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.
Bug:
18766581
(cherry picked from commit
457731f69e3106b5aae8fc04f9565af1d875876c)
Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
Jeff Davidson [Thu, 15 Jan 2015 23:02:01 +0000 (23:02 +0000)]
am
4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
* commit '
4df903dbc71c48e2db6fae9390795b81782470b4':
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
Jeff Davidson [Thu, 15 Jan 2015 22:49:02 +0000 (22:49 +0000)]
Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
Christopher Ferris [Thu, 15 Jan 2015 01:52:14 +0000 (01:52 +0000)]
am
457731f6: Use the timeout stack dump functions.
* commit '
457731f69e3106b5aae8fc04f9565af1d875876c':
Use the timeout stack dump functions.
Christopher Ferris [Thu, 15 Jan 2015 01:39:17 +0000 (01:39 +0000)]
am
d195f87b: Fix message when a command times out.
* commit '
d195f87b2dd4aa731a21ef3acd321e2441c5bffb':
Fix message when a command times out.
Christopher Ferris [Wed, 14 Jan 2015 21:23:30 +0000 (13:23 -0800)]
Use the timeout stack dump functions.
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.
Bug:
18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
Christopher Ferris [Fri, 9 Jan 2015 23:56:21 +0000 (15:56 -0800)]
Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.
Bug:
18766581
(cherry picked from commit
67c5a8af9ed128d8bb56d4723303aef6f0a4500f)
Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
Jeff Sharkey [Thu, 18 Dec 2014 18:26:57 +0000 (10:26 -0800)]
Follow StrictMode refactoring.
Bug:
18335678
Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a
Riley Andrews [Tue, 13 Jan 2015 23:26:02 +0000 (23:26 +0000)]
am
aec92242: Merge "Replace all instances of intptr_t with uintptr_t."
* commit '
aec922426620804768f00a6c5cb902f278f2967f':
Replace all instances of intptr_t with uintptr_t.
Riley Andrews [Tue, 13 Jan 2015 23:26:01 +0000 (23:26 +0000)]
am
41a160c4: Merge "Fix signed/unsigned comparison warnings in driver interface test."
* commit '
41a160c4cda1ef2c916028ec2d0801da738b5249':
Fix signed/unsigned comparison warnings in driver interface test.
Riley Andrews [Tue, 13 Jan 2015 22:06:05 +0000 (22:06 +0000)]
Merge "Replace all instances of intptr_t with uintptr_t."
Riley Andrews [Tue, 13 Jan 2015 22:00:23 +0000 (22:00 +0000)]
Merge "Fix signed/unsigned comparison warnings in driver interface test."
Riley Andrews [Tue, 13 Jan 2015 02:16:29 +0000 (18:16 -0800)]
Replace all instances of intptr_t with uintptr_t.
When compiling 32 bit binaries against a 64 bit binder interface,
implicit promotions of intptr_t types to uint64_t for fields in the
binder ioctl structures can result in invalid pointers because of sign
extension.
Brian Carlstrom [Tue, 13 Jan 2015 06:27:45 +0000 (06:27 +0000)]
am
6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit '
6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
[MIPS] Build libGLES for mips64, mips32r6
Brian Carlstrom [Tue, 13 Jan 2015 06:19:36 +0000 (06:19 +0000)]
Merge "[MIPS] Build libGLES for mips64, mips32r6"
Duane Sand [Wed, 26 Nov 2014 00:43:13 +0000 (16:43 -0800)]
[MIPS] Build libGLES for mips64, mips32r6
For now, use generic C code instead of assembler.
Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
Riley Andrews [Tue, 13 Jan 2015 02:14:55 +0000 (18:14 -0800)]
Fix signed/unsigned comparison warnings in driver interface test.
Jesse Hall [Mon, 12 Jan 2015 23:41:46 +0000 (23:41 +0000)]
am
5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
* commit '
5b730570be2bd1f90346a5921d0b70dc11351396':
surfaceflinger: use Mutex timedLock instead of tryLock loop
Jesse Hall [Mon, 12 Jan 2015 23:33:06 +0000 (23:33 +0000)]
Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
Jeff Davidson [Mon, 12 Jan 2015 20:10:05 +0000 (20:10 +0000)]
am
83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
* commit '
83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
Revert "Update protobuf library from 2.3 to 2.6."
Jeff Davidson [Mon, 12 Jan 2015 20:07:43 +0000 (20:07 +0000)]
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
This reverts commit
bca4262dac55cc59b28d6fde658d5f8a254fcc2d.
Change-Id: I8ecd859340779dfacffba4c6d1a44c5cdbdfceed
Jeff Davidson [Mon, 12 Jan 2015 20:00:51 +0000 (20:00 +0000)]
Merge "Revert "Update protobuf library from 2.3 to 2.6.""
Jeff Davidson [Mon, 12 Jan 2015 20:00:33 +0000 (20:00 +0000)]
Revert "Update protobuf library from 2.3 to 2.6."
This reverts commit
a42cdf169060e1bb65c77bc8a394d266403d8583.
Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
Jeff Davidson [Mon, 12 Jan 2015 19:46:11 +0000 (19:46 +0000)]
am
9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
* commit '
9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
Update protobuf library from 2.3 to 2.6.
Jeff Davidson [Mon, 12 Jan 2015 19:37:20 +0000 (19:37 +0000)]
Merge "Update protobuf library from 2.3 to 2.6."
Christopher Ferris [Mon, 12 Jan 2015 18:48:23 +0000 (18:48 +0000)]
am
4f9bfffe: Merge "Fix message when a command times out."
* commit '
4f9bfffe23d40fdaabe91ea7c7691e52800edb79':
Fix message when a command times out.
Christopher Ferris [Mon, 12 Jan 2015 18:41:06 +0000 (18:41 +0000)]
Merge "Fix message when a command times out."
Jesse Hall [Tue, 23 Dec 2014 21:57:23 +0000 (13:57 -0800)]
surfaceflinger: use Mutex timedLock instead of tryLock loop
Rather than trying to acquire the state lock without waiting three
times at 1 second intervals in SurfaceFlinger::dump(), just try to
acquire the lock once with a 1 second timeout. Avoids spurious mutex
acquire failures that lead to flaky
com.android.cts.jank.opengl.CtsHostJankOpenGl results.
Bug:
18842510
Change-Id: I00ce6109647de2aef8831dd2f8fa98652ba7f4e0
Rachad [Sat, 10 Jan 2015 02:00:07 +0000 (02:00 +0000)]
am
806f23de: OpenMax IL: Added support for E-AC3 codec configuration params
* commit '
806f23de71be2494cfabbe08d11c09606966a5d5':
OpenMax IL: Added support for E-AC3 codec configuration params
Christopher Ferris [Fri, 9 Jan 2015 23:56:21 +0000 (15:56 -0800)]
Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.
Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
Elliott Hughes [Sat, 10 Jan 2015 00:14:12 +0000 (00:14 +0000)]
am
a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."
* commit '
a7dcab6954467fa3726824a099b83d0e7490d6d5':
We have POSIX clocks, and we don't need to ask for the openssl headers.
Elliott Hughes [Sat, 10 Jan 2015 00:03:46 +0000 (00:03 +0000)]
Merge "We have POSIX clocks, and we don't need to ask for the openssl headers."
Elliott Hughes [Fri, 9 Jan 2015 23:56:15 +0000 (15:56 -0800)]
We have POSIX clocks, and we don't need to ask for the openssl headers.
This code doesn't need to run on the Mac, and the BoringSSL transition
will be easier without references to external/openssl.
Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
Jeff Davidson [Tue, 16 Sep 2014 01:14:22 +0000 (18:14 -0700)]
Update protobuf library from 2.3 to 2.6.
Remove generated cpp/h files for gltrace.proto as we can use the build
system to generate these dynamically.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Andreas Gampe [Wed, 7 Jan 2015 22:12:26 +0000 (22:12 +0000)]
am
96e4409e: Merge "Installd: Disallow relocation for decryption"
* commit '
96e4409e8c38b1d79285eca9886d44ff850b5748':
Installd: Disallow relocation for decryption
Andreas Gampe [Wed, 7 Jan 2015 22:04:28 +0000 (22:04 +0000)]
Merge "Installd: Disallow relocation for decryption"
neo.chae [Wed, 7 Jan 2015 09:46:13 +0000 (18:46 +0900)]
Installd: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.
If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.
This patch ensures that apps are not being relocated.
Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>