Commit Graph

10481 Commits

Author SHA1 Message Date
Andrew Hsieh
e930ae8832 am 471fdb7d: am da34e72a: am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
* commit '471fdb7d70b712699762adf66b8789dc4777b2cd':
  Support poll for MIPS.
2012-08-21 17:35:57 -07:00
Andrew Hsieh
471fdb7d70 am da34e72a: am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
* commit 'da34e72a5d5b4df1487a13df7524969f34a637e4':
  Support poll for MIPS.
2012-08-21 17:34:23 -07:00
Andrew Hsieh
da34e72a5d am d8326f3e: am 6395d994: am d27250b2: Merge "Support poll for MIPS."
* commit 'd8326f3e342db6d4f345d9ea545ff885e73b82ba':
  Support poll for MIPS.
2012-08-21 17:33:33 -07:00
Andrew Hsieh
d8326f3e34 am 6395d994: am d27250b2: Merge "Support poll for MIPS."
* commit '6395d9941e681ea4b1ebdd5a1d099ca6177c51bd':
  Support poll for MIPS.
2012-08-21 17:31:46 -07:00
Andrew Hsieh
6395d9941e am d27250b2: Merge "Support poll for MIPS."
* commit 'd27250b2635ad3d115983f7308cfd87ee2c3a056':
  Support poll for MIPS.
2012-08-21 17:29:12 -07:00
Andrew Hsieh
d27250b263 Merge "Support poll for MIPS." 2012-08-21 17:17:57 -07:00
The Android Open Source Project
54c69adcf8 am 1b5166d5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '1b5166d568d2eafbe30f302f82775736a27fd7f0':
2012-08-21 16:07:00 -07:00
The Android Open Source Project
1b5166d568 Reconcile with jb-mr1-release - do not merge
Change-Id: I92970980359d14bf768069fe63d21c25ebb7019e
2012-08-21 16:05:01 -07:00
Chao-Ying Fu
4cd3283046 Support poll for MIPS.
Change-Id: I1299817ea06c9f9ff5701dce0c6166370ef9e87d
2012-08-21 15:27:38 -07:00
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
0067b6b2cd am 74f5f803: am 14f0370c: am 75dc23df: am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '74f5f8032de3b42c03689ab92368831db86a8886':
  Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:34:43 -07:00
Andrew Hsieh
74f5f8032d am 14f0370c: am 75dc23df: am ef423edc: am e3cfaa6d: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
* commit '14f0370cd82ed704fe0b0e643d5ab60c4e3193be':
  Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:33:00 -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
dfd9f1ddc0 am 291d2564: am 96e381a6: am 2f05a2da: am 459e3389: am 99791042: Merge "Support fcntl for MIPS with different cmd."
* commit '291d256472341116c77c95c96b68b7c0c341135c':
  Support fcntl for MIPS with different cmd.
2012-08-20 19:31:46 -07:00
Andrew Hsieh
291d256472 am 96e381a6: am 2f05a2da: am 459e3389: am 99791042: Merge "Support fcntl for MIPS with different cmd."
* commit '96e381a6662b5279585737588656d04edc9e9926':
  Support fcntl for MIPS with different cmd.
2012-08-20 19:29:44 -07: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
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