OSDN Git Service
Dan Stoza [Fri, 13 Mar 2015 19:28:08 +0000 (19:28 +0000)]
Merge "libgui: Prepare for IGBC::BufferItem removal"
Dan Stoza [Fri, 13 Mar 2015 17:19:44 +0000 (17:19 +0000)]
Merge "libgui: Add a BufferItem overload to IGBC::acquire"
Dan Stoza [Fri, 13 Mar 2015 15:42:33 +0000 (15:42 +0000)]
Merge "libgui: Add BufferItem(IGBC::BufferItem)"
Dan Stoza [Fri, 13 Mar 2015 15:41:46 +0000 (15:41 +0000)]
Merge "libgui: Add a union to BufferItem for refactoring"
Dan Stoza [Thu, 12 Mar 2015 20:58:47 +0000 (13:58 -0700)]
libgui: Prepare for IGBC::BufferItem removal
Switches some dependencies from IGraphicBufferConsumer::BufferItem to
android::BufferItem and adds some methods to facilitate incrementally
changing client code to do the same.
Change-Id: I699ed0a6837076867ca756b28d1ffb2238f7a0d9
Dan Stoza [Wed, 11 Mar 2015 23:38:47 +0000 (16:38 -0700)]
libgui: Add a BufferItem overload to IGBC::acquire
Adds an overload of IGraphicBufferConsumer::acquireBuffer which takes
an android::BufferItem instead of an IGBC::BufferItem.
Change-Id: I9c3bc8037fa9438d4d9080b8afb694219ef2f71f
Dan Stoza [Wed, 11 Mar 2015 22:35:39 +0000 (15:35 -0700)]
libgui: Add BufferItem(IGBC::BufferItem)
Add a constructor for building a BufferItem from an
IGraphicBufferConsumer::BufferItem.
Change-Id: I1394e693314429ada93427889f10b7b01c948053
Dan Stoza [Wed, 11 Mar 2015 21:04:22 +0000 (14:04 -0700)]
libgui: Add a union to BufferItem for refactoring
Currently, there are two instances of BufferItem: one inside of
IGraphicBufferConsumer, and a standalone one inside of libgui. They
only differ in the name of one of the fields, so this change modifies
the one inside of libgui to have a union of both names so that the
one inside of IGBC can eventually be refactored away.
Change-Id: I64f495105f56cbf5803cea4aa6b072ea29b70cf5
Andreas Gampe [Tue, 10 Mar 2015 22:04:23 +0000 (22:04 +0000)]
am
53cab935: am
1fc747d2: am
5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '
53cab935d54b6ca013c6a236e09d9160a6aa7f54':
Installd: Pass debuggable flag
Dan Stoza [Tue, 10 Mar 2015 15:48:55 +0000 (15:48 +0000)]
am
105aa28e: am
b275b4dc: am
3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '
105aa28eeff9d31eebc7645aecb7630918a09b2a':
SurfaceFlinger: Fix null pointer exception
Andreas Gampe [Tue, 10 Mar 2015 15:07:45 +0000 (15:07 +0000)]
am
1fc747d2: am
5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '
1fc747d20c1a390e1de3d482d2eafde6dc7e6236':
Installd: Pass debuggable flag
Andreas Gampe [Tue, 10 Mar 2015 02:10:06 +0000 (02:10 +0000)]
am
5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '
5a25a63de2693177b15817fb19b684ca7bfec582':
Installd: Pass debuggable flag
Andreas Gampe [Mon, 9 Mar 2015 22:14:47 +0000 (22:14 +0000)]
Merge "Installd: Pass debuggable flag"
Andreas Gampe [Tue, 3 Mar 2015 17:15:06 +0000 (09:15 -0800)]
Installd: Pass debuggable flag
Pass the debuggable flag from the package manager to dex2oat.
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
Dan Stoza [Mon, 9 Mar 2015 18:09:17 +0000 (18:09 +0000)]
am
b275b4dc: am
3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '
b275b4dc3e5dcbae1e171bd51165a93f16332ef4':
SurfaceFlinger: Fix null pointer exception
Dan Stoza [Mon, 9 Mar 2015 18:05:26 +0000 (18:05 +0000)]
am
3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '
3949f664c71ad1269ee0c921d176e3b4484015cc':
SurfaceFlinger: Fix null pointer exception
Dan Stoza [Mon, 9 Mar 2015 18:00:28 +0000 (18:00 +0000)]
Merge "SurfaceFlinger: Fix null pointer exception"
Dan Stoza [Mon, 9 Mar 2015 17:04:11 +0000 (10:04 -0700)]
SurfaceFlinger: Fix null pointer exception
Fixes a null pointer exception in getActiveConfig
Bug:
19416124
Change-Id: I45a01f67affb63a348866ce42a6013c5eb71fe8f
Eino-Ville Talvala [Fri, 6 Mar 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Add dataSpace to buffer queues; remove old format enums."
Dan Stoza [Fri, 6 Mar 2015 20:50:08 +0000 (20:50 +0000)]
Merge "Surface: Permit an IProducerListener on connect"
Ronghua Wu [Fri, 6 Mar 2015 18:16:00 +0000 (18:16 +0000)]
Merge "drm: add event for resource manager."
Dan Stoza [Fri, 6 Mar 2015 17:13:21 +0000 (17:13 +0000)]
Merge "SurfaceFlinger: Add --static-screen stats"
Nick Kralevich [Thu, 5 Mar 2015 22:43:39 +0000 (22:43 +0000)]
am
f11b58f2: am
fcf1689c: am
5fec7915: Merge "service_manager: reorder permission checks for find"
* commit '
f11b58f296039a0bf90336e4c38c014f11542092':
service_manager: reorder permission checks for find
Dan Stoza [Thu, 5 Mar 2015 19:05:59 +0000 (11:05 -0800)]
SurfaceFlinger: Add --static-screen stats
Adds a --static-screen option to dumpsys SurfaceFlinger, which
displays screen-on time broken down by the time between the prior
frame and the current frame. An example dump looks like this:
$ adb shell dumpsys SurfaceFlinger --static-screen
Static screen stats:
< 1 frames: 12.235 s (3.5%)
< 2 frames: 29.898 s (8.7%)
< 3 frames: 15.370 s (4.4%)
< 4 frames: 13.103 s (3.8%)
< 5 frames: 15.780 s (4.6%)
< 6 frames: 2.022 s (0.6%)
< 7 frames: 0.201 s (0.1%)
7+ frames: 256.887 s (74.4%)
The buckets are exclusive, so '< 3 frames' covers the interval
[2, 3) frames
Bug:
19543586
Change-Id: I3253a54c23995d25e96016997acedd0775956b60
Nick Kralevich [Thu, 5 Mar 2015 22:35:20 +0000 (22:35 +0000)]
am
fcf1689c: am
5fec7915: Merge "service_manager: reorder permission checks for find"
* commit '
fcf1689c1a1654cb3b480356a1ba3ebf198f2943':
service_manager: reorder permission checks for find
Nick Kralevich [Thu, 5 Mar 2015 21:48:25 +0000 (21:48 +0000)]
am
5fec7915: Merge "service_manager: reorder permission checks for find"
* commit '
5fec79156d749322dcc0376da1d6cf4d9ee9ccf4':
service_manager: reorder permission checks for find
Nick Kralevich [Thu, 5 Mar 2015 21:43:07 +0000 (21:43 +0000)]
Merge "service_manager: reorder permission checks for find"
Nick Kralevich [Thu, 5 Mar 2015 18:58:40 +0000 (10:58 -0800)]
service_manager: reorder permission checks for find
Reorder the find permission checks. This avoids generating misleading
SELinux denials when a service doesn't exist, or when a service is
prohibited to isolated apps.
The original reason for structuring the code this way is explained
in https://android-review.googlesource.com/#/c/100530/4/cmds/servicemanager/service_manager.c@172
The concern at the time was to avoid leaking a situation where
a caller could probe for the existance of a service. This turns out
to be unnecessary. The same return value is used for both a
permission denied and a service not found. The only side effect
is the generation of an SELinux audit log, which likely won't be
accessible to the calling application.
Change-Id: I9760e1821ed16102fa5f9bec07f8c34944565be9
Ronghua Wu [Thu, 5 Mar 2015 17:58:16 +0000 (09:58 -0800)]
drm: add event for resource manager.
Bug:
19265536
Change-Id: I524962f84aefae28a8ffd411d1bb6521bedb02a7
Dan Stoza [Wed, 4 Mar 2015 22:58:02 +0000 (14:58 -0800)]
GLConsumer: Fix unsigned subtraction during crop
Since some variables had been switched from signed to unsigned, there
was a section of code that was guaranteed to be incorrect because it
effectively did 'if (a < b) { c = a - b; }'. This change fixes it.
Bug:
19346631
Change-Id: I9cdd6c9a0179801addebb5d6dc1fbaddf8f53c62
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
Dan Stoza [Tue, 3 Mar 2015 06:12:37 +0000 (22:12 -0800)]
Surface: Permit an IProducerListener on connect
This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer.
Change-Id: I5ea5229bf3a329bf02c6bd20e7247039c75d136b
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."