The Android Automerger
09e05e8459
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:45 -07:00
Andrew Hsieh
14f0370cd8
am 75dc23df: am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '75dc23dfef59c8cbc9a27d8bcf10ae06677f0fee':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:31:01 -07:00
Andrew Hsieh
75dc23dfef
am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit 'ef423edc2c4123db56dff07d809652c6234873be':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:29:13 -07:00
Andrew Hsieh
ef423edc2c
am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit 'e3cfaa6d4251136ad6f3221d881ac12786169663':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:27:39 -07:00
Andrew Hsieh
e3cfaa6d42
Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
2012-08-21 03:25:11 -07:00
Andrew Hsieh
a5280d312d
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
...
Those are C funcitons
Change-Id: I8f481f29b278b8f28d9ce04635d0f04e9e148cb5
2012-08-21 10:41:51 +08:00
Andrew Hsieh
96e381a666
am 2f05a2da: am 459e3389: am 99791042: Merge "Support fcntl for MIPS with different cmd."
...
* commit '2f05a2da3705f9719095356c9f7eaf39020f8346':
Support fcntl for MIPS with different cmd.
2012-08-20 19:28:19 -07:00
Andrew Hsieh
2f05a2da37
am 459e3389: am 99791042: Merge "Support fcntl for MIPS with different cmd."
...
* commit '459e3389fdd0ecd0bc94dd4f6650fbb0f8d5499c':
Support fcntl for MIPS with different cmd.
2012-08-20 19:27:22 -07:00
Andrew Hsieh
459e3389fd
am 99791042: Merge "Support fcntl for MIPS with different cmd."
...
* commit '99791042b17e0d20adafe3d14a3197306520beb2':
Support fcntl for MIPS with different cmd.
2012-08-20 19:24:54 -07:00
Andrew Hsieh
99791042b1
Merge "Support fcntl for MIPS with different cmd."
2012-08-20 19:16:35 -07:00
Chao-Ying Fu
5f79ffb271
Support fcntl for MIPS with different cmd.
...
Change-Id: I8d180ab9e18d69f0fd2748ad317319b691a86f35
2012-08-20 18:08:30 -07:00
Andrew Hsieh
f82aafff62
am 7ffead69: am 16fc5540: am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
...
* commit '7ffead69aa04c9c315559d19c6d278aa9270282c':
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:34:44 -07:00
Andrew Hsieh
7ffead69aa
am 16fc5540: am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
...
* commit '16fc554082d640fd051e703115ecdf9753a03ffc':
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:33:38 -07:00
Andrew Hsieh
16fc554082
am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
...
* commit '57d7c46837c8a0a64e8b339d45fdc2ebd09648d5':
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:31:53 -07:00
Andrew Hsieh
57d7c46837
Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
2012-08-20 17:28:46 -07:00
Chao-Ying Fu
1d34dd0c27
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
...
Change-Id: Ib889899250fdfc6e7caded2506228f640fcdff3a
2012-08-20 17:07:27 -07:00
Andrew Hsieh
d71b7d1be7
am 02fb9c0f: am c8ad44c4: am 4d39411f: Merge "Support mprotect."
...
* commit '02fb9c0f992ebf5154cef8a9dfd017194bf3929e':
Support mprotect.
2012-08-20 16:31:28 -07:00
Andrew Hsieh
02fb9c0f99
am c8ad44c4: am 4d39411f: Merge "Support mprotect."
...
* commit 'c8ad44c4f3226c1e3669dd39c001976f550923be':
Support mprotect.
2012-08-20 16:29:46 -07:00
Andrew Hsieh
c8ad44c4f3
am 4d39411f: Merge "Support mprotect."
...
* commit '4d39411f7d41e3c931f8be6b1455ba9627fa71b9':
Support mprotect.
2012-08-20 16:27:38 -07:00
Eino-Ville Talvala
cfb58b73a1
Merge "Emulator gralloc: Fix RAW_SENSOR conditions." into jb-mr1-dev
2012-08-20 16:26:31 -07:00
Andrew Hsieh
4d39411f7d
Merge "Support mprotect."
2012-08-20 16:26:07 -07:00
Chao-Ying Fu
f43f982232
Support mprotect.
...
Change-Id: Ic786eb35f69d44379129faec02b1023ab2c3282a
2012-08-20 16:02:41 -07:00
Eino-Ville Talvala
97438d2456
Merge "EmulatedCamera2: Improve thread sequencing" into jb-mr1-dev
2012-08-20 14:03:36 -07:00
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