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
5c38409ed9
am 33f7952c: am f82aafff: am 7ffead69: am 16fc5540: am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
...
* commit '33f7952c5167f56912cff8dde6a11f416f212769':
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:38:57 -07:00
Andrew Hsieh
33f7952c51
am f82aafff: am 7ffead69: am 16fc5540: am 57d7c468: Merge "Fix flags to *_PORTABLE in open_portable(), and support openat_portable()."
...
* commit 'f82aafff6249d491737828274bfbbf9e30d12dde':
Fix flags to *_PORTABLE in open_portable(), and support openat_portable().
2012-08-20 17:36:51 -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
463164a840
am cb256e5b: am d71b7d1b: am 02fb9c0f: am c8ad44c4: am 4d39411f: Merge "Support mprotect."
...
* commit 'cb256e5bce467084c7bb649e4d2268873f8a68e1':
Support mprotect.
2012-08-20 16:36:04 -07:00
Andrew Hsieh
cb256e5bce
am d71b7d1b: am 02fb9c0f: am c8ad44c4: am 4d39411f: Merge "Support mprotect."
...
* commit 'd71b7d1be70609ef63a5ed3444af6db5c7ad9f3b':
Support mprotect.
2012-08-20 16:34:21 -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
Eino-Ville Talvala
00beb80f9d
am 08d13376: am cfb58b73: Merge "Emulator gralloc: Fix RAW_SENSOR conditions." into jb-mr1-dev
...
* commit '08d13376da55083577b4229f6de88152d90bd28f':
Emulator gralloc: Fix RAW_SENSOR conditions.
2012-08-20 16:29:16 -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
08d13376da
am cfb58b73: Merge "Emulator gralloc: Fix RAW_SENSOR conditions." into jb-mr1-dev
...
* commit 'cfb58b73a15511461c0e1394094337cb6b57381a':
Emulator gralloc: Fix RAW_SENSOR conditions.
2012-08-20 16:27:31 -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
d11af9229e
am d0b48512: am 97438d24: Merge "EmulatedCamera2: Improve thread sequencing" into jb-mr1-dev
...
* commit 'd0b485127fdcfba5ece4d6255f7abd7f57efc852':
EmulatedCamera2: Improve thread sequencing
2012-08-20 14:07:55 -07:00
Eino-Ville Talvala
fe9323eba6
am e8d431e9: am 02bcd398: Merge "Emulator gralloc: Support YV12" into jb-mr1-dev
...
* commit 'e8d431e98a28ce01444118f729b044e6d746c26c':
Emulator gralloc: Support YV12
2012-08-20 14:07:53 -07:00
Eino-Ville Talvala
d0b485127f
am 97438d24: Merge "EmulatedCamera2: Improve thread sequencing" into jb-mr1-dev
...
* commit '97438d2456b3972f8d54bfa927a672b6032adc98':
EmulatedCamera2: Improve thread sequencing
2012-08-20 14:05:26 -07:00
Eino-Ville Talvala
e8d431e98a
am 02bcd398: Merge "Emulator gralloc: Support YV12" into jb-mr1-dev
...
* commit '02bcd398dc8daac5ff89638a249ece0112583761':
Emulator gralloc: Support YV12
2012-08-20 14:05:25 -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
a901bc2fe9
am 9bca4e46: am 6af1dca8: am 10d5a088: am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."
...
* commit '9bca4e46ff6fb263e87c7f460ba9ea50f296a005':
Update path to telephonytests directory.
2012-08-20 10:35:39 -07:00
Jean-Baptiste Queru
ea5d00301a
am c2c4a76e: am 46060c08: am 8d6a35c1: (-s ours) am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."
...
* commit 'c2c4a76eeb3bece02f015436b253b608bdcc31fd':
Fix Eclipse .classpath file for JB.
2012-08-20 10:35:38 -07:00
Jean-Baptiste Queru
9bca4e46ff
am 6af1dca8: am 10d5a088: am c2d80e96: am 90b4e80e: Merge "Update path to telephonytests directory."
...
* commit '6af1dca8e41b07009de16e98d03500e9d7ff68ed':
Update path to telephonytests directory.
2012-08-20 10:33:36 -07:00
Jean-Baptiste Queru
c2c4a76eeb
am 46060c08: am 8d6a35c1: (-s ours) am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."
...
* commit '46060c08fd6f9aa6bb52800d0162cef59f0a796d':
Fix Eclipse .classpath file for JB.
2012-08-20 10:33:34 -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
bcc82c160e
am 14f99f20: am 50b47c57: 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/mac
...
* commit '14f99f20fbcb0b11c49085ea5d39a86748363cf2':
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:43:35 -07:00
Andrew Hsieh
205f353a4a
am cf7c2984: am 0209524b: am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
...
* commit 'cf7c2984a842079c42288112602d097c6dd1cd8e':
Remove linux-unistd.h
2012-08-20 05:43:34 -07:00
Andrew Hsieh
d2587a2b9d
am 204c5a96: am 07606f03: am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
...
* commit '204c5a96fbae96f02c52cea1aae480ba44789b01':
Replace link.h for mips with new version for all platforms
2012-08-20 05:43:32 -07:00
Andrew Hsieh
14f99f20fb
am 50b47c57: 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
...
* commit '50b47c5732b6049a2d619546507ccc03c446eed6':
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:42:11 -07:00
Andrew Hsieh
cf7c2984a8
am 0209524b: am 6b92aee0: am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"
...
* commit '0209524bd47351d43e0403d10ecd94c2c3464b0b':
Remove linux-unistd.h
2012-08-20 05:42:10 -07:00
Andrew Hsieh
204c5a96fb
am 07606f03: am 41f23731: am 7305bb53: am ed722f12: Merge "Replace link.h for mips with new version for all platforms"
...
* commit '07606f0324ecf0040df46cd02b2a00cfc5a302e7':
Replace link.h for mips with new version for all platforms
2012-08-20 05:42:08 -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