Commit Graph

10842 Commits

Author SHA1 Message Date
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
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
900139e605 am 3eadba67: am f9fc2a56: Use new display manager API.
* commit '3eadba67786e6e44ae17d5f6531343d95133e27d':
  Use new display manager API.
2012-08-19 23:10:35 -07:00
Jeff Brown
3eadba6778 am f9fc2a56: Use new display manager API.
* commit 'f9fc2a56f18b5d9684b48f0fe7a4e3b24eab5847':
  Use new display manager API.
2012-08-19 23:08:28 -07: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
db1c0d4bc6 am 851d9b25: (-s ours) am 0ea80e8a: am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '851d9b25e84e8df2f353cbb7326f44240ac6351c':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:23:31 -07:00
Andrew Hsieh
851d9b25e8 am 0ea80e8a: am 1cca87b3: (-s ours) am f49ba834: (-s ours) am 1659906d: (-s ours) Merge "Retire LOCAL_NDK_VERSION (DO NOT MERGE)"
* commit '0ea80e8a0f2f49c7a06c99d84d86d1b564f883a6':
  Retire LOCAL_NDK_VERSION (DO NOT MERGE)
2012-08-18 01:21:01 -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