OSDN Git Service
Eino-Ville Talvala [Fri, 20 Feb 2015 00:10:43 +0000 (16:10 -0800)]
Add dataSpace to buffer queues; remove old format enums.
- Wire up new dataSpace parameter through buffer queue stack
- Update tests to include the parameter
- Switch eglApi to using dataSpace to indicate sRGB gamma/linear
difference
- Remove RAW_SENSOR in favor of RAW16
- Remove use of sRGB format enums
- Add default dataspace to buffer queue core
- Add query for default dataspace
Change-Id: I070bd2e7c56506055c419004c29e2e3feac725df
Christopher Ferris [Thu, 26 Feb 2015 19:01:57 +0000 (11:01 -0800)]
resolved conflicts for merge of
04e13acd to master
Change-Id: I9bbc9907a5cbde8b374398493bc0dc6b056ea734
Christopher Ferris [Thu, 26 Feb 2015 18:49:48 +0000 (18:49 +0000)]
am
69a141e0: am
9d68ed0e: Merge "Add timeout for dump_file."
* commit '
69a141e07fab2672cf2cc23dcc124c46995fbf98':
Add timeout for dump_file.
Christopher Ferris [Thu, 26 Feb 2015 18:40:42 +0000 (18:40 +0000)]
am
9d68ed0e: Merge "Add timeout for dump_file."
* commit '
9d68ed0ecd3a101c13a163cfe730b13b1564b442':
Add timeout for dump_file.
Christopher Ferris [Thu, 26 Feb 2015 18:35:01 +0000 (18:35 +0000)]
Merge "Add timeout for dump_file."
Mark Salyzyn [Wed, 25 Feb 2015 00:57:19 +0000 (16:57 -0800)]
resolved conflicts for merge of
d6c8ae9c to master
Change-Id: I3cbb6ed0958b4328aca1798c7fe6080c31555a3a
Mark Salyzyn [Thu, 26 Feb 2015 17:35:44 +0000 (17:35 +0000)]
am
2f655dae: am
bb67beca: Merge "dumpstate: add pstore read"
* commit '
2f655daeea66bf5d0e065b45a7abd515cfeeaf97':
dumpstate: add pstore read
Mark Salyzyn [Thu, 26 Feb 2015 17:29:07 +0000 (17:29 +0000)]
am
bb67beca: Merge "dumpstate: add pstore read"
* commit '
bb67beca35e7d570ede193a316a92022fbc2f810':
dumpstate: add pstore read
Mark Salyzyn [Thu, 26 Feb 2015 17:23:41 +0000 (17:23 +0000)]
Merge "dumpstate: add pstore read"
Mark Salyzyn [Tue, 16 Dec 2014 17:09:26 +0000 (09:09 -0800)]
dumpstate: add pstore read
Call logcat -L to pull any LAST Android logs. If the kernel is not
configured for PSTORE and PSTORE_PMSG, the hopes are the empty
content will pressure vendors to slice up and configure support.
Change-Id: I5fddfa1e0f59f24fccc30b257ba68af8a8cf8640
Christopher Ferris [Tue, 10 Feb 2015 20:15:01 +0000 (12:15 -0800)]
Add timeout for dump_file.
It turns out dump_file is used on a number of /proc and system files.
In one case, the read of a file stalled and caused a bugreport to
hang forever. It's still possible if there is a kernel bug that this
could stall forever, but less likely.
Also, change the return type of nanotime to uint64_t.
Testing:
- Created a named fifo and verified that dump_file fails with a timeout.
- Created a large /data/anr/traces.txt to verify that large files still
dump properly and that the additional NONBLOCK parameter doesn't cause
a problem.
- Created a dummy /data/tombstones/tombstone_00 to verify that the
dump of these files still works.
- Compared a dump using the old dumpstate to the new dumpstate to verify
nothing obviously different.
Bug:
19117030
Change-Id: I0d3dd27583c853cdaccd2fd278748cb5f9ccd4fb
Greg Hackmann [Thu, 26 Feb 2015 02:27:29 +0000 (02:27 +0000)]
am
beb89e11: am
6f57b269: am
56f8c6c4: Merge "Error compiling waitforvsync.cpp"
* commit '
beb89e11ca777c92b7e2cc06c25f47d5a75ee7ad':
Error compiling waitforvsync.cpp
Greg Hackmann [Thu, 26 Feb 2015 01:13:30 +0000 (01:13 +0000)]
am
6f57b269: am
56f8c6c4: Merge "Error compiling waitforvsync.cpp"
* commit '
6f57b269f9ae779a0e85919cdc7a54bfb383e402':
Error compiling waitforvsync.cpp
Greg Hackmann [Thu, 26 Feb 2015 01:07:03 +0000 (01:07 +0000)]
am
56f8c6c4: Merge "Error compiling waitforvsync.cpp"
* commit '
56f8c6c42dab4c3636edb62162088e5d765fa956':
Error compiling waitforvsync.cpp
Greg Hackmann [Wed, 25 Feb 2015 23:42:17 +0000 (23:42 +0000)]
Merge "Error compiling waitforvsync.cpp"
Dan Albert [Wed, 25 Feb 2015 23:13:46 +0000 (23:13 +0000)]
am
52a442d2: am
8d319341: am
79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
* commit '
52a442d26db65818da0664f96c0fa47ce56e446d':
Fix pointer-to-int and int-to-pointer warnings.
Dan Albert [Wed, 25 Feb 2015 23:07:35 +0000 (23:07 +0000)]
am
8d319341: am
79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
* commit '
8d31934148301b449d1b6277e25a6c3a8d162dff':
Fix pointer-to-int and int-to-pointer warnings.
Dan Albert [Wed, 25 Feb 2015 23:00:44 +0000 (23:00 +0000)]
am
79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
* commit '
797498450cbcb87c28636e775ada942005436909':
Fix pointer-to-int and int-to-pointer warnings.
Dan Albert [Wed, 25 Feb 2015 22:50:10 +0000 (22:50 +0000)]
Merge "Fix pointer-to-int and int-to-pointer warnings."
Michael Wright [Tue, 24 Feb 2015 03:06:39 +0000 (03:06 +0000)]
Merge "Remove eng tag from input tests."
Michael Wright [Tue, 24 Feb 2015 01:20:16 +0000 (17:20 -0800)]
Remove eng tag from input tests.
Tests always get built with the platform now anyways. Also, remove
the dependency on libandroidfw since it causes issues on PDK builds.
Change-Id: Ib73ec620abac3782d9fdae48778064c06b30aae0
Michael Wright [Tue, 24 Feb 2015 00:06:35 +0000 (00:06 +0000)]
Merge "Move inputflinger process to host directory"
Michael Wright [Sat, 14 Feb 2015 01:35:16 +0000 (17:35 -0800)]
Move inputflinger process to host directory
Change-Id: I08ee44bf8b93e7f1760ee9f8d9876a1e2e2e86c8
Dan Albert [Mon, 23 Feb 2015 18:39:14 +0000 (10:39 -0800)]
Fix pointer-to-int and int-to-pointer warnings.
Change-Id: If534cbcf2c3e644270572cbf829ba9b5acab29e6
Mark Salyzyn [Mon, 23 Feb 2015 15:30:22 +0000 (15:30 +0000)]
am
453c6a78: am
a455ec21: am
d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
* commit '
453c6a781de3dc728212d66f1ca7fda2ae984974':
vsync.cpp test is throwing error whe compiled
Mark Salyzyn [Mon, 23 Feb 2015 15:23:37 +0000 (15:23 +0000)]
am
a455ec21: am
d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
* commit '
a455ec21fa5341b8cee09eff73a9b465a6c28faa':
vsync.cpp test is throwing error whe compiled
Mark Salyzyn [Mon, 23 Feb 2015 15:19:59 +0000 (15:19 +0000)]
am
d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
* commit '
d80268ba19f9217c5459a2952580090ef84a7b78':
vsync.cpp test is throwing error whe compiled
Mark Salyzyn [Mon, 23 Feb 2015 15:14:23 +0000 (15:14 +0000)]
Merge "vsync.cpp test is throwing error whe compiled"
Nanik Tolaram [Sat, 14 Feb 2015 00:32:46 +0000 (11:32 +1100)]
vsync.cpp test is throwing error whe compiled
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:55:44: error: 'ALOOPER_EVENT_INPUT' was not declared in this scope
loop->addFd(myDisplayEvent.getFd(), 0, ALOOPER_EVENT_INPUT, receiver,
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:64:18: error: 'ALOOPER_POLL_WAKE' was not declared in this scope
case ALOOPER_POLL_WAKE:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:67:18: error: 'ALOOPER_POLL_CALLBACK' was not declared in this scope
case ALOOPER_POLL_CALLBACK:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:70:18: error: 'ALOOPER_POLL_TIMEOUT' was not declared in this scope
case ALOOPER_POLL_TIMEOUT:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:73:18: error: 'ALOOPER_POLL_ERROR' was not declared in this scope
case ALOOPER_POLL_ERROR:
^
it is missing one header file
Change-Id: Ie2fb02523a866b13a99edf837f072d101cacb466
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
Elliott Hughes [Fri, 20 Feb 2015 01:26:57 +0000 (01:26 +0000)]
am
58573ecd: am
485d3730: am
f3f22e55: Merge "Add missing <unistd.h> include for close."
* commit '
58573ecdd201f3c678a68377f682e64ddaef0be6':
Add missing <unistd.h> include for close.
Elliott Hughes [Fri, 20 Feb 2015 01:20:21 +0000 (01:20 +0000)]
am
485d3730: am
f3f22e55: Merge "Add missing <unistd.h> include for close."
* commit '
485d3730042381ed203e312ad70fec9cb0d2d934':
Add missing <unistd.h> include for close.
Elliott Hughes [Fri, 20 Feb 2015 01:13:29 +0000 (01:13 +0000)]
am
f3f22e55: Merge "Add missing <unistd.h> include for close."
* commit '
f3f22e555bae8e362f3cac1efb289ca321266035':
Add missing <unistd.h> include for close.
Elliott Hughes [Fri, 20 Feb 2015 01:08:07 +0000 (01:08 +0000)]
Merge "Add missing <unistd.h> include for close."
Elliott Hughes [Fri, 20 Feb 2015 00:58:44 +0000 (16:58 -0800)]
Add missing <unistd.h> include for close.
Change-Id: Iebce6d74eecb8c275e800b7f47f74bbd4374860d
Bill Yi [Fri, 20 Feb 2015 00:36:44 +0000 (00:36 +0000)]
Bill Yi [Fri, 20 Feb 2015 00:23:15 +0000 (00:23 +0000)]
Bill Yi [Thu, 19 Feb 2015 22:31:45 +0000 (14:31 -0800)]
Michael Lentine [Thu, 19 Feb 2015 01:21:04 +0000 (01:21 +0000)]
am
a4201c10: am
592cc33c: am
e86f7e96: am
3c0272ba: am
dc2d031a: am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
a4201c10aeb977a6e4e8c1bcb9ceca5ab591d0ad':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 01:06:53 +0000 (01:06 +0000)]
am
592cc33c: am
e86f7e96: am
3c0272ba: am
dc2d031a: am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
592cc33c408d5c91ad87e1a51d72269d4525a10b':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 01:00:47 +0000 (01:00 +0000)]
am
e86f7e96: am
3c0272ba: am
dc2d031a: am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:47:06 +0000 (00:47 +0000)]
am
3c0272ba: am
dc2d031a: am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:32:42 +0000 (00:32 +0000)]
am
dc2d031a: am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
dc2d031a7ee05725ad3d8cab4887d6c7a4063967':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:25:34 +0000 (00:25 +0000)]
am
da9fd70d: am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
da9fd70de125b0e6df4fb6285f538be9133c7b22':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:15:40 +0000 (00:15 +0000)]
am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
2758eb2e67d935cf1f04e3d713438c6ac7fe8b89':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:10:11 +0000 (00:10 +0000)]
am
fde92eb0: Update maxNumber to be smaller.
* commit '
fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
Update maxNumber to be smaller.
Michael Lentine [Wed, 18 Feb 2015 18:14:18 +0000 (10:14 -0800)]
Update maxNumber to be smaller.
There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.
Bug:
18076253
Change-Id: I3a3e50ee3078a4710e9737114e65afc923ed0573
Jesse Hall [Wed, 18 Feb 2015 17:48:26 +0000 (17:48 +0000)]
am
bf4fed77: am
5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround."
* commit '
bf4fed779105fa61ca21888395517664de30e052':
egl: Remove old tuna BGRA vs RGBA workaround.
Jesse Hall [Wed, 18 Feb 2015 17:43:48 +0000 (17:43 +0000)]
am
5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround."
* commit '
5fa8f9305e8db81fa0007a016318846f1dfef4b9':
egl: Remove old tuna BGRA vs RGBA workaround.
Jesse Hall [Wed, 18 Feb 2015 17:31:12 +0000 (17:31 +0000)]
Merge "egl: Remove old tuna BGRA vs RGBA workaround."
Jeff Brown [Wed, 18 Feb 2015 11:38:55 +0000 (11:38 +0000)]
am
7735c058: am
c9aa628d: Cancel touch events when a low-level touch gesture occurs.
* commit '
7735c058869e0a7fd716054110aa6cb4eff4b075':
Cancel touch events when a low-level touch gesture occurs.
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.
Svetoslav [Wed, 18 Feb 2015 00:11:58 +0000 (00:11 +0000)]
Merge "Remove unnecessary settings state dump."
Svetoslav [Tue, 17 Feb 2015 20:49:15 +0000 (12:49 -0800)]
Remove unnecessary settings state dump.
The settings provider now implements dump, hance special dump
code is no longer needed.
Change-Id: I93af3f6acac4ac70d6bbf569d2348cb16b8c0946
Elliott Hughes [Tue, 17 Feb 2015 02:18:59 +0000 (02:18 +0000)]
am
6576937f: am
75b81aee: Merge "Add missing <sys/file.h> include for flock."
* commit '
6576937ff165cfd8e2230cbeb40c6d783675c517':
Add missing <sys/file.h> include for flock.
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
Nanik Tolaram [Fri, 13 Feb 2015 13:26:59 +0000 (00:26 +1100)]
Error compiling waitforvsync.cpp
The waitforvsync.cpp throws error when compiling. Following is the error log
target thumb C++: test-waitforvsync <= frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp
frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp: In function 'int main(int, char**)':
frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp:43:17: error: 'close' was not declared in this scope
close(fd);
^
....
....
make: *** [out/target/product/grouper/obj/EXECUTABLES/test-waitforvsync_intermediates/waitforvsync.o] Error 1
the file is missing #include <unistd.h>
Change-Id: I57728dbde65641cd3138625f9a590f9db8648158
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
Alistair Strachan [Thu, 12 Feb 2015 20:33:25 +0000 (12:33 -0800)]
egl: Remove old tuna BGRA vs RGBA workaround.
Some time before kitkat, a workaround was put in place to keep tuna
working with obsolete PowerVR GPU drivers. The tuna product was dropped
in AOSP for kitkat, but the workaround remained.
There are still a number of devices shipping with OMAP4 processors, and
this workaround continues to be applied on those products even when it
is not required. The effect is that virtual display CTS will fail on
those devices.
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:12:12 +0000 (20:12 +0000)]
am
26cc3d0b: am
b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
* commit '
26cc3d0b67ff4daf31eaeed0ecd87b391978aadb':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Lajos Molnar [Wed, 11 Feb 2015 20:12:10 +0000 (20:12 +0000)]
am
459c0b6d: am
9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"
* commit '
459c0b6d3693c6e7f29c538300cc78f64b8c318b':
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
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 [Wed, 11 Feb 2015 02:50:02 +0000 (02:50 +0000)]
am
34e32466: am
8511b3ae: Merge "Remove -z option."
* commit '
34e32466466ad3f46697798c9f9644d62390c9b5':
Remove -z option.
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
Lajos Molnar [Mon, 9 Feb 2015 04:14:06 +0000 (04:14 +0000)]
am
dac8c969: (-s ours) am
d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
* commit '
dac8c96955488346697570db3769a029704f71ac':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
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:54:16 +0000 (20:54 +0000)]
am
8f706b5d: am
ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams
* commit '
8f706b5ddb4aa15f123ecc7329670604284a2624':
add bUsingNativeBuffers to DescribeColorFormatParams
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 18:56:45 +0000 (18:56 +0000)]
am
16c62c46: am
50ad67e4: Merge "Add better timeout mechanism for running commands."
* commit '
16c62c468aacf40496a7cad94f49795a797cdd37':
Add better timeout mechanism for running commands.
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
Ruben Brunk [Tue, 3 Feb 2015 20:23:13 +0000 (20:23 +0000)]
Merge "Add ProcessInfoService to activity manager."
Ruben Brunk [Thu, 29 Jan 2015 02:13:33 +0000 (18:13 -0800)]
Add ProcessInfoService to activity manager.
- Adds a new AIDL interface for querying process
information from activity manager.
Bug:
19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
Elliott Hughes [Fri, 30 Jan 2015 21:28:15 +0000 (21:28 +0000)]
am
42b5e6d4: am
51bfedd8: Merge "Add missing includes."
* commit '
42b5e6d49c92c3ec89fec7c68438a61e9e021e72':
Add missing includes.
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 18:55:21 +0000 (10:55 -0800)]
CpuConsumer: fix build error
Chad Jones [Thu, 29 Jan 2015 18:32:25 +0000 (10:32 -0800)]
Chad Jones [Thu, 29 Jan 2015 18:32:02 +0000 (10:32 -0800)]
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
Michael Lentine [Thu, 29 Jan 2015 01:22:35 +0000 (17:22 -0800)]
resolved conflicts for merge of
2f1e3b4d to master
Change-Id: I68dcde35fb57593140651df67d60f4cafac441dc
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:39:18 +0000 (17:39 +0000)]
am
e55073a9: am
0e17a265: Merge "Switch dumpstate to "ip link list"."
* commit '
e55073a96ca7e9447592988614664b3c9666d93a':
Switch dumpstate to "ip link list".