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
Jeff Brown
7735c05886
am c9aa628d
: Cancel touch events when a low-level touch gesture occurs.
...
* commit 'c9aa628d065eb08d6fa30f0ac21c6eca4cfbab75':
Cancel touch events when a low-level touch gesture occurs.
2015-02-18 02:17:08 +00:00
Svetoslav
326db4f167
Merge "Remove unnecessary settings state dump."
2015-02-18 00:11:59 +00:00
Svetoslav
d527bcbc10
Remove unnecessary settings state dump.
...
The settings provider now implements dump, hance special dump
code is no longer needed.
Change-Id: I93af3f6acac4ac70d6bbf569d2348cb16b8c0946
2015-02-17 12:55:55 -08:00
Elliott Hughes
4b2266daaa
am 6576937f
: am 75b81aee
: Merge "Add missing <sys/file.h> include for flock."
...
* commit '6576937ff165cfd8e2230cbeb40c6d783675c517':
Add missing <sys/file.h> include for flock.
2015-02-17 02:18:59 +00:00
Elliott Hughes
6576937ff1
am 75b81aee
: Merge "Add missing <sys/file.h> include for flock."
...
* commit '75b81aee3830d0a8c7c10e3ca7f1652543dbbaca':
Add missing <sys/file.h> include for flock.
2015-02-17 01:38:59 +00:00
Elliott Hughes
75b81aee38
Merge "Add missing <sys/file.h> include for flock."
2015-02-17 01:24:49 +00:00
Elliott Hughes
2ead70ce67
Add missing <sys/file.h> include for flock.
...
Change-Id: I5c9bb4aa74d8a36d44e086bbcb5d60876727ce4c
2015-02-16 10:44:22 -08:00
Nanik Tolaram
ee9701744a
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>
2015-02-14 00:26:59 +11:00
Alistair Strachan
733a807547
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.
2015-02-12 12:33:25 -08:00
Jeff Brown
c9aa628d06
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
2015-02-12 11:27:24 -08:00
Nick Vaccaro
fc35dd8bc9
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
2015-02-11 20:12:12 +00:00
Lajos Molnar
af428d4ede
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"
2015-02-11 20:12:10 +00:00
Nick Vaccaro
26cc3d0b67
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
2015-02-11 20:04:42 +00:00
Lajos Molnar
459c0b6d36
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"
2015-02-11 20:04:40 +00:00
Nick Vaccaro
b9bb1f139b
Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
2015-02-11 19:58:19 +00:00
Lajos Molnar
9b6be8e10b
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
...
This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4.
Bug: 19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
2015-02-11 09:58:58 -08:00
Christopher Ferris
1d24efe4d3
am 34e32466
: am 8511b3ae
: Merge "Remove -z option."
...
* commit '34e32466466ad3f46697798c9f9644d62390c9b5':
Remove -z option.
2015-02-11 02:50:02 +00:00
Christopher Ferris
34e3246646
am 8511b3ae
: Merge "Remove -z option."
...
* commit '8511b3ae5eb42810f97f7c3e993d7f80d3393b83':
Remove -z option.
2015-02-10 16:53:52 +00:00
Christopher Ferris
8511b3ae5e
Merge "Remove -z option."
2015-02-10 01:26:58 +00:00
Christopher Ferris
ff4a4dc7e6
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
2015-02-09 16:45:35 -08:00
Lajos Molnar
2f15949efc
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
2015-02-09 04:14:06 +00:00
Nick Vaccaro
9bb99b1570
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
...
Change-Id: I7e5516de805618df41de0f9b06805002e32708c3
2015-02-07 00:09:05 +00:00
Lajos Molnar
dac8c96955
am d25be0ea
: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
...
* commit 'd25be0ea48c775e4038163b546c9553e294d4fdc':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
2015-02-07 00:06:07 +00:00
Lajos Molnar
d25be0ea48
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
2015-02-06 19:26:50 +00:00
Lajos Molnar
c7f664a8c2
am 8f706b5d
: am ea5da67d
: add bUsingNativeBuffers to DescribeColorFormatParams
...
* commit '8f706b5ddb4aa15f123ecc7329670604284a2624':
add bUsingNativeBuffers to DescribeColorFormatParams
2015-02-04 20:54:16 +00:00
Lajos Molnar
8f706b5ddb
am ea5da67d
: add bUsingNativeBuffers to DescribeColorFormatParams
...
* commit 'ea5da67d90647a1d4b395be51bf9cec218b98b71':
add bUsingNativeBuffers to DescribeColorFormatParams
2015-02-04 20:47:43 +00:00
Christopher Ferris
9368dadcbc
am 16c62c46
: am 50ad67e4
: Merge "Add better timeout mechanism for running commands."
...
* commit '16c62c468aacf40496a7cad94f49795a797cdd37':
Add better timeout mechanism for running commands.
2015-02-04 18:56:45 +00:00
Christopher Ferris
16c62c468a
am 50ad67e4
: Merge "Add better timeout mechanism for running commands."
...
* commit '50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
Add better timeout mechanism for running commands.
2015-02-04 02:08:44 +00:00
Christopher Ferris
50ad67e4ce
Merge "Add better timeout mechanism for running commands."
2015-02-04 01:57:13 +00:00
Christopher Ferris
1a9a338615
Add better timeout mechanism for running commands.
...
Change-Id: I60fc9e7d59c3e0e4b8b2f69f79c6903240bfd131
2015-02-03 14:53:44 -08:00
Ruben Brunk
a27e2f7179
Merge "Add ProcessInfoService to activity manager."
2015-02-03 20:23:14 +00:00