Eino-Ville Talvala
02bcd398dc
Merge "Emulator gralloc: Support YV12" into jb-mr1-dev
2012-08-20 14:03:20 -07:00
Eino-Ville Talvala
61649d232c
Emulator gralloc: Fix RAW_SENSOR conditions.
...
Allow RAW_SENSOR to be used for any combination of CPU read/write and
Camera read/write, instead of only camera->cpu or cpu->camera.
Change-Id: I032b9531e9069a202c1a3767b77975c808703285
2012-08-20 11:05:01 -07:00
Eino-Ville Talvala
cb5703d5ea
EmulatedCamera2: Improve thread sequencing
...
- When the readout thread is the slow point, frames could be dropped
in various ways. Add signals to slow down the configure thread and
the sensor when the readout thread is behind.
- Clean up verbose logs to be clearer
Bug: 6243944
Change-Id: I2efb909f03183273a71dc7edede3aa107117f558
2012-08-20 11:05:01 -07:00
Jean-Baptiste Queru
6af1dca8e4
am 10d5a088: am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."
...
* commit '10d5a0885d4b4f6488f305d033a9c54cb7b1203b':
Update path to telephonytests directory.
2012-08-20 10:31:43 -07:00
Jean-Baptiste Queru
46060c08fd
am 8d6a35c1: (-s ours) am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."
...
* commit '8d6a35c1cae7e73a6f15d581952b7764df3e0365':
Fix Eclipse .classpath file for JB.
2012-08-20 10:31:42 -07:00
Jean-Baptiste Queru
10d5a0885d
am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."
...
* commit 'c2d80e96922c9cad7831c6c951f7be949faf37f9':
Update path to telephonytests directory.
2012-08-20 10:28:14 -07:00
Jean-Baptiste Queru
c2d80e9692
am 90b4e80e: Merge "Update path to telephonytests directory."
...
* commit '90b4e80ee9193884a6e53410770f6022110bea3c':
Update path to telephonytests directory.
2012-08-20 10:26:28 -07:00
Jean-Baptiste Queru
90b4e80ee9
Merge "Update path to telephonytests directory."
2012-08-20 10:20:55 -07:00
Jean-Baptiste Queru
8d6a35c1ca
am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."
...
* commit 'f36d011911afcfb7e774da3d23f0a8583e24429b':
Fix Eclipse .classpath file for JB.
2012-08-20 10:12:16 -07:00
Jean-Baptiste Queru
f36d011911
am f2b91719: Merge "Fix Eclipse .classpath file for JB."
...
* commit 'f2b917197e35d5a74bf256ee0d212df31cbfdac4':
Fix Eclipse .classpath file for JB.
2012-08-20 10:10:48 -07:00
Jean-Baptiste Queru
f2b917197e
Merge "Fix Eclipse .classpath file for JB."
2012-08-20 10:06:11 -07:00
Eino-Ville Talvala
34a4d2d519
Emulator gralloc: Support YV12
...
Bug: 6243944
Change-Id: I5f416ab0ae15143df422c0f79d91841984b4fabe
2012-08-20 09:13:48 -07:00
The Android Automerger
3568ea4489
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:33:51 -07:00
Andrew Hsieh
50b47c5732
am b1dca78a: am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent w
...
* commit 'b1dca78a7403a1603edb6b0a993a33bb4d6478d2':
Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch>/include/machine/*
2012-08-20 05:40:01 -07:00
Andrew Hsieh
0209524bd4
am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
...
* commit '6b92aee0021e677a861e1a420250516c42697518':
Remove linux-unistd.h
2012-08-20 05:40:00 -07:00
Andrew Hsieh
07606f0324
am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
...
* commit '41f23731cb2414b2813d54f0401e0e5a7bb45521':
Replace link.h for mips with new version for all platforms
2012-08-20 05:39:58 -07:00
Andrew Hsieh
b1dca78a74
am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bion
...
* commit '11489016437203d2539ed02410397b835bd03037':
Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch>/include/machine/*
2012-08-20 05:37:59 -07:00
Andrew Hsieh
6b92aee002
am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
...
* commit 'bc95f91d24b6238f3a56363468bfb3129eb7429b':
Remove linux-unistd.h
2012-08-20 05:37:58 -07:00
Andrew Hsieh
41f23731cb
am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
...
* commit '7305bb5363804a5d08e8b489e8498a91c4bd7d47':
Replace link.h for mips with new version for all platforms
2012-08-20 05:37:56 -07:00
Andrew Hsieh
1148901643
am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch
...
* commit '7f26cea9049c087b0552fb0f364ab6142a1ad227':
Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch>/include/machine/*
2012-08-20 05:36:04 -07:00
Andrew Hsieh
bc95f91d24
am e33ad352: Merge "Remove linux-unistd.h"
...
* commit 'e33ad3528d23349a01113289272ffeff08106cf7':
Remove linux-unistd.h
2012-08-20 05:36:02 -07:00
Andrew Hsieh
7305bb5363
am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
...
* commit 'ed722f1242d330bd3fe29ff0793e4c616190ef2d':
Replace link.h for mips with new version for all platforms
2012-08-20 05:36:01 -07:00
Andrew Hsieh
7f26cea904
Merge "Update stdint.h; Refresh <arch>/include/machine/* stdint.h: https://android-review.googlesource.com/#/c/41714/ https://android-review.googlesource.com/#/c/40576/ <arch>/include/machine/*: to be consistent with bionic/libc/<arch>/include/machine/*"
2012-08-20 05:22:01 -07:00
Andrew Hsieh
e33ad3528d
Merge "Remove linux-unistd.h"
2012-08-20 05:21:26 -07:00
Andrew Hsieh
ed722f1242
Merge "Replace link.h for mips with new version for all platforms"
2012-08-20 05:20:59 -07:00
Andrew Hsieh
61a3e1462c
Update stdint.h; Refresh <arch>/include/machine/*
...
stdint.h: https://android-review.googlesource.com/#/c/41714/
https://android-review.googlesource.com/#/c/40576/
<arch>/include/machine/*: to be consistent with
bionic/libc/<arch>/include/machine/*
Change-Id: Ieeb44c3e864bf64c4cad4d3c9d94024a7b520181
2012-08-20 18:32:15 +08:00
Pavel Chupin
51d4794277
Replace link.h for mips with new version for all platforms
...
Update from bionic/libc/include/link.h
For details see https://android-review.googlesource.com/#/c/41705
Change-Id: Ib9e658aa0606584b148e951ad199dc12c2f563c2
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2012-08-20 10:48:23 +04:00
Jeff Brown
f9fc2a56f1
Use new display manager API.
...
Also deleted some dead code.
Change-Id: I4d070b6642caf2c143eeacceeb678c102e5da19c
2012-08-19 21:13:09 -07:00
Andrew Hsieh
0ea80e8a0f
am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
...
* commit '1cca87b3239c3e0af7efd419a022784663779c9d':
Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:19:32 -07:00
Andrew Hsieh
1cca87b323
am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
...
* commit 'f49ba8344b2de51bf1f96ea036248b1fad88627b':
Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:17:27 -07:00
Andrew Hsieh
f49ba8344b
am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
...
* commit '1659906d5e6d59bcf823d6bb781e15846abfda9c':
Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:16:15 -07:00
Andrew Hsieh
7de8e93107
Remove linux-unistd.h
...
Change-Id: I95cc89bfacb05d92da658fa533cb75ac65d397bf
2012-08-18 16:08:51 +08:00
Andrew Hsieh
1659906d5e
Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
2012-08-18 01:04:19 -07:00
Andrew Hsieh
3a5c958c17
am 171040c6: am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
...
* commit '171040c6bd85293e352ba7a5e461b1b945223f0c':
Make sys/ioctl_compat.h portable.
2012-08-17 17:48:25 -07:00
Andrew Hsieh
171040c6bd
am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."
...
* commit 'bd37ac2e42ff00e1bde14b00f0d68997210b27b4':
Make sys/ioctl_compat.h portable.
2012-08-17 17:46:11 -07:00
Andrew Hsieh
bd37ac2e42
Merge "Make sys/ioctl_compat.h portable."
2012-08-17 17:38:04 -07:00
Andrew Hsieh
27f086928b
am f78ddc64: am d333a0d1: Merge "Update/Copy fenv.h"
...
* commit 'f78ddc649987b9f0e7d6a7328d54cd31099976ff':
Update/Copy fenv.h
2012-08-17 17:30:45 -07:00
Andrew Hsieh
6f0bea016b
am 5ed8f17a: am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
...
* commit '5ed8f17a475f46897b00db43d3920a4420f21765':
Add portable support for stuct statfs and two functions.
2012-08-17 17:30:43 -07:00
Andrew Hsieh
f78ddc6499
am d333a0d1: Merge "Update/Copy fenv.h"
...
* commit 'd333a0d1f8afd5dfd2afaff0079f22450bb0aa0d':
Update/Copy fenv.h
2012-08-17 17:28:41 -07:00
Andrew Hsieh
5ed8f17a47
am f8e828d2: Merge "Add portable support for stuct statfs and two functions."
...
* commit 'f8e828d2d0cf1598968b8c93dc8627c9a8a99c7c':
Add portable support for stuct statfs and two functions.
2012-08-17 17:28:40 -07:00
Andrew Hsieh
d333a0d1f8
Merge "Update/Copy fenv.h"
2012-08-17 17:17:08 -07:00
Andrew Hsieh
f8e828d2d0
Merge "Add portable support for stuct statfs and two functions."
2012-08-17 17:16:20 -07:00
Chao-Ying Fu
584ef7f14c
Make sys/ioctl_compat.h portable.
...
Change-Id: Id9c4c68c8422d46d463b9c987be180ea50c05099
2012-08-17 17:11:23 -07:00
Chao-Ying Fu
64c217eb07
Add portable support for stuct statfs and two functions.
...
Change-Id: I1e34428574a11bedb3a5a35a45dc519fcae3cd03
2012-08-17 12:22:39 -07:00
Andrew Hsieh
8bb4fd7683
Update/Copy fenv.h
...
Update from bionic/libm/arm/fenv.h
Copy from bionic/libm/mips/fenv.h
Related issue:
http://code.google.com/p/android/issues/detail?id=36229
Change-Id: I4cba9523ecc466720927798e461fc167d6d6df7c
2012-08-17 19:02:58 +08:00
Andrew Hsieh
67b1682b7a
am 4bfda2d3: am 84061fa1: Merge "Support all portable requests."
...
* commit '4bfda2d3d10ff8846e3dd6210150a6a0f1313348':
Support all portable requests.
2012-08-16 20:12:31 -07:00
Andrew Hsieh
59ebc568ca
am 598f966a: am 2177f88f: Merge "Support all MAP flags and update mmap_portable."
...
* commit '598f966a4b65ba87eadc441e49f79e8585470bdf':
Support all MAP flags and update mmap_portable.
2012-08-16 20:12:29 -07:00
Andrew Hsieh
4bfda2d3d1
am 84061fa1: Merge "Support all portable requests."
...
* commit '84061fa198767d4926f07503a297ee1059ad7b33':
Support all portable requests.
2012-08-16 20:10:10 -07:00
Andrew Hsieh
598f966a4b
am 2177f88f: Merge "Support all MAP flags and update mmap_portable."
...
* commit '2177f88f011e2fcdaaba34ba810859b30cfd2593':
Support all MAP flags and update mmap_portable.
2012-08-16 20:10:06 -07:00
Andrew Hsieh
84061fa198
Merge "Support all portable requests."
2012-08-16 19:50:56 -07:00