Eino-Ville Talvala
5b75a513e4
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
2015-03-04 11:58:52 -08:00
Christopher Ferris
123edd9f81
resolved conflicts for merge of 04e13acd
to master
...
Change-Id: I9bbc9907a5cbde8b374398493bc0dc6b056ea734
2015-02-26 11:01:57 -08:00
Christopher Ferris
04e13acdbf
am 69a141e0: am 9d68ed0e: Merge "Add timeout for dump_file."
...
* commit '69a141e07fab2672cf2cc23dcc124c46995fbf98':
Add timeout for dump_file.
2015-02-26 18:49:48 +00:00
Christopher Ferris
69a141e07f
am 9d68ed0e: Merge "Add timeout for dump_file."
...
* commit '9d68ed0ecd3a101c13a163cfe730b13b1564b442':
Add timeout for dump_file.
2015-02-26 18:40:42 +00:00
Christopher Ferris
9d68ed0ecd
Merge "Add timeout for dump_file."
2015-02-26 18:35:02 +00:00
Mark Salyzyn
59b0b568d0
resolved conflicts for merge of d6c8ae9c
to master
...
Change-Id: I3cbb6ed0958b4328aca1798c7fe6080c31555a3a
2015-02-26 10:05:40 -08:00
Mark Salyzyn
d6c8ae9c15
am 2f655dae: am bb67beca: Merge "dumpstate: add pstore read"
...
* commit '2f655daeea66bf5d0e065b45a7abd515cfeeaf97':
dumpstate: add pstore read
2015-02-26 17:35:44 +00:00
Mark Salyzyn
2f655daeea
am bb67beca: Merge "dumpstate: add pstore read"
...
* commit 'bb67beca35e7d570ede193a316a92022fbc2f810':
dumpstate: add pstore read
2015-02-26 17:29:07 +00:00
Mark Salyzyn
bb67beca35
Merge "dumpstate: add pstore read"
2015-02-26 17:23:41 +00:00
Mark Salyzyn
2262c16372
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
2015-02-26 07:41:41 -08:00
Christopher Ferris
54bcc5ffd5
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
2015-02-25 19:59:29 -08:00
Greg Hackmann
53ec1f0d18
am beb89e11: am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"
...
* commit 'beb89e11ca777c92b7e2cc06c25f47d5a75ee7ad':
Error compiling waitforvsync.cpp
2015-02-26 02:27:29 +00:00
Greg Hackmann
beb89e11ca
am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"
...
* commit '6f57b269f9ae779a0e85919cdc7a54bfb383e402':
Error compiling waitforvsync.cpp
2015-02-26 01:13:30 +00:00
Greg Hackmann
6f57b269f9
am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"
...
* commit '56f8c6c42dab4c3636edb62162088e5d765fa956':
Error compiling waitforvsync.cpp
2015-02-26 01:07:03 +00:00
Greg Hackmann
56f8c6c42d
Merge "Error compiling waitforvsync.cpp"
2015-02-25 23:42:17 +00:00
Dan Albert
1d41e34639
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.
2015-02-25 23:13:46 +00:00
Dan Albert
52a442d26d
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.
2015-02-25 23:07:35 +00:00
Dan Albert
8d31934148
am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
...
* commit '797498450cbcb87c28636e775ada942005436909':
Fix pointer-to-int and int-to-pointer warnings.
2015-02-25 23:00:44 +00:00
Dan Albert
797498450c
Merge "Fix pointer-to-int and int-to-pointer warnings."
2015-02-25 22:50:10 +00:00
Michael Wright
ca870723d1
Merge "Remove eng tag from input tests."
2015-02-24 03:06:40 +00:00
Michael Wright
eb4ed3e41d
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
2015-02-23 17:20:16 -08:00
Michael Wright
857a35d267
Merge "Move inputflinger process to host directory"
2015-02-24 00:06:35 +00:00
Michael Wright
6f783602c0
Move inputflinger process to host directory
...
Change-Id: I08ee44bf8b93e7f1760ee9f8d9876a1e2e2e86c8
2015-02-23 16:04:57 -08:00
Dan Albert
ad0f52fc2b
Fix pointer-to-int and int-to-pointer warnings.
...
Change-Id: If534cbcf2c3e644270572cbf829ba9b5acab29e6
2015-02-23 10:45:27 -08:00
Mark Salyzyn
129da2ba07
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
2015-02-23 15:30:22 +00:00
Mark Salyzyn
453c6a781d
am a455ec21: am d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
...
* commit 'a455ec21fa5341b8cee09eff73a9b465a6c28faa':
vsync.cpp test is throwing error whe compiled
2015-02-23 15:23:37 +00:00
Mark Salyzyn
a455ec21fa
am d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
...
* commit 'd80268ba19f9217c5459a2952580090ef84a7b78':
vsync.cpp test is throwing error whe compiled
2015-02-23 15:19:59 +00:00
Mark Salyzyn
d80268ba19
Merge "vsync.cpp test is throwing error whe compiled"
2015-02-23 15:14:24 +00:00
Nanik Tolaram
5b06dc00ac
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>
2015-02-23 15:13:56 +00:00
Elliott Hughes
700619e73e
am 58573ecd: am 485d3730: am f3f22e55: Merge "Add missing <unistd.h> include for close."
...
* commit '58573ecdd201f3c678a68377f682e64ddaef0be6':
Add missing <unistd.h> include for close.
2015-02-20 01:26:57 +00:00
Elliott Hughes
58573ecdd2
am 485d3730: am f3f22e55: Merge "Add missing <unistd.h> include for close."
...
* commit '485d3730042381ed203e312ad70fec9cb0d2d934':
Add missing <unistd.h> include for close.
2015-02-20 01:20:21 +00:00
Elliott Hughes
485d373004
am f3f22e55: Merge "Add missing <unistd.h> include for close."
...
* commit 'f3f22e555bae8e362f3cac1efb289ca321266035':
Add missing <unistd.h> include for close.
2015-02-20 01:13:29 +00:00
Elliott Hughes
f3f22e555b
Merge "Add missing <unistd.h> include for close."
2015-02-20 01:08:08 +00:00
Elliott Hughes
14df3564fb
Add missing <unistd.h> include for close.
...
Change-Id: Iebce6d74eecb8c275e800b7f47f74bbd4374860d
2015-02-19 16:58:44 -08:00
Bill Yi
2e099a5c58
am a6c2bcc4: am 28d41f56: Merge commit \'26cc3d0b67ff4daf31eaeed0ecd87b391978aadb\' into HEAD
...
* commit 'a6c2bcc4b82cab8a828a14e7d1681d7ae1636e88':
2015-02-20 00:36:44 +00:00
Bill Yi
a6c2bcc4b8
am 28d41f56: Merge commit \'26cc3d0b67ff4daf31eaeed0ecd87b391978aadb\' into HEAD
...
* commit '28d41f5640cab96b5cac4b4b233ae9f721c96975':
2015-02-20 00:23:15 +00:00
Bill Yi
28d41f5640
Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEAD
2015-02-19 14:31:45 -08:00
Michael Lentine
f6303459d1
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.
2015-02-19 01:21:04 +00:00
Michael Lentine
a4201c10ae
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.
2015-02-19 01:06:53 +00:00
Michael Lentine
592cc33c40
am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit 'e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c':
Update maxNumber to be smaller.
2015-02-19 01:00:47 +00:00
Michael Lentine
e86f7e96a7
am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit '3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d':
Update maxNumber to be smaller.
2015-02-19 00:47:06 +00:00
Michael Lentine
3c0272ba8f
am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit 'dc2d031a7ee05725ad3d8cab4887d6c7a4063967':
Update maxNumber to be smaller.
2015-02-19 00:32:42 +00:00
Michael Lentine
dc2d031a7e
am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit 'da9fd70de125b0e6df4fb6285f538be9133c7b22':
Update maxNumber to be smaller.
2015-02-19 00:25:34 +00:00
Michael Lentine
da9fd70de1
am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
...
* commit '2758eb2e67d935cf1f04e3d713438c6ac7fe8b89':
Update maxNumber to be smaller.
2015-02-19 00:15:40 +00:00
Michael Lentine
2758eb2e67
am fde92eb0: Update maxNumber to be smaller.
...
* commit 'fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
Update maxNumber to be smaller.
2015-02-19 00:10:11 +00:00
Michael Lentine
fde92eb0ff
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
2015-02-18 10:34:37 -08:00
Jesse Hall
cf359da98b
am bf4fed77: am 5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround."
...
* commit 'bf4fed779105fa61ca21888395517664de30e052':
egl: Remove old tuna BGRA vs RGBA workaround.
2015-02-18 17:48:26 +00:00
Jesse Hall
bf4fed7791
am 5fa8f930: Merge "egl: Remove old tuna BGRA vs RGBA workaround."
...
* commit '5fa8f9305e8db81fa0007a016318846f1dfef4b9':
egl: Remove old tuna BGRA vs RGBA workaround.
2015-02-18 17:43:48 +00:00
Jesse Hall
5fa8f9305e
Merge "egl: Remove old tuna BGRA vs RGBA workaround."
2015-02-18 17:31:13 +00:00
Jeff Brown
ae5a081ddf
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.
2015-02-18 11:38:55 +00:00