Nick Pelly
3d81bae2af
am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
...
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 21:08:29 -08:00
Jamie Gennis
1e8f74ebc0
am 8b8c321c: am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
...
* commit '8b8c321c70687ace750e42b745b6e96258d739cd':
EGL: Use cache sizes defined in the BoardConfig
2011-11-21 21:08:23 -08:00
Jamie Gennis
185a0a0420
am c2597295: am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
...
* commit 'c25972950c2ea62fb085524dbe737c2bf0f08f4a':
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
2011-11-21 21:08:21 -08:00
Eric Fischer
74f9906262
am 281d1072: (-s ours) am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '281d1072b4d880f70016d4553c7fcc25c00c89d3':
Import revised translations. DO NOT MERGE
2011-11-21 21:08:20 -08:00
Chia-chi Yeh
3703def0f6
am 0e67685e: am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
...
* commit '0e67685e53cbcf7682a0364cf34fd3ac0632596f':
SIP: turn off verbose logs.
2011-11-21 21:07:56 -08:00
John Reck
7875b06f16
am 786513ab: am 0507ac4d: Use isHighEndGfx to determine texture pool
...
* commit '786513aba608d958e69deee3fbdf003bdf5d9632':
Use isHighEndGfx to determine texture pool
2011-11-21 21:07:33 -08:00
Jeff Brown
504f982fd3
Use libcorkscrew to format the stack trace.
...
Change-Id: I3a5439ada76bc77c2dd491eaed2272e16a811cc7
2011-11-21 21:04:55 -08:00
James Dong
9056b5656c
am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
...
* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
2011-11-21 20:29:59 -08:00
James Dong
ef94a3fb02
Merge "Fix log spamming during time lapse video recording" into ics-mr1
2011-11-21 20:28:27 -08:00
Romain Guy
f178f8e1e5
am 1766b0e2: Fix the build
...
* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
Fix the build
2011-11-21 18:31:29 -08:00
Wu-cheng Li
01dcd424f6
am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
...
* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
Move Camera.Sound to a stand-alone class CameraSound.
2011-11-21 18:13:06 -08:00
Wu-cheng Li
92bc62e00b
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
2011-11-21 18:10:52 -08:00
Mathias Agopian
82ac31f9fa
am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
...
* commit '07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
don't report an error when disconnecting from an abandoned surfacetexture
2011-11-21 18:00:52 -08:00
Mathias Agopian
4869991f74
am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
...
* commit '8646cd42df5edc5f5b9c52d6ab5309821e875656':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
2011-11-21 17:58:42 -08:00
Romain Guy
33a771f7da
am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
...
* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
Notify views when EGL resources are about to be destroyed Bug #5639899
2011-11-21 17:58:40 -08:00
Mathias Agopian
7723773df3
Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
2011-11-21 17:57:31 -08:00
Mathias Agopian
75cf5a7480
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
2011-11-21 17:57:20 -08:00
Romain Guy
7e7fa2543d
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
2011-11-21 17:57:05 -08:00
Adam Powell
07281fa255
am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
...
* commit 'fb0784da5f602bf6410ef914d625c3cedfa11e9f':
Fix bug 5521467 - Monkeys and ActionBar custom tab views
2011-11-21 17:36:20 -08:00
Adam Powell
a9273339c2
Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
2011-11-21 17:34:57 -08:00
Nick Pelly
85ec70a41a
Merge "Throw a nicer error message when using an invalid context to create Nfc"
2011-11-21 17:31:45 -08:00
satok
6026a897d0
Merge "add sentence level spell checker hidden apis"
2011-11-21 16:30:07 -08:00
Nick Pelly
f3e284a1e0
am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
...
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
2011-11-21 16:05:30 -08:00
Nick Pelly
33733ed06b
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
2011-11-21 16:03:40 -08:00
Jamie Gennis
a3677781d0
am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
...
* commit 'b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
EGL: Use cache sizes defined in the BoardConfig
2011-11-21 15:56:12 -08:00
Jamie Gennis
f59fa92c30
am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
...
* commit '53cf20202a3848a6c61b5229814268180a3d2f16':
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
2011-11-21 15:56:11 -08:00
Jamie Gennis
e011aa2b0f
Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
2011-11-21 15:54:54 -08:00
Jamie Gennis
b440acd1c8
Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
...
* changes:
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
2011-11-21 15:54:40 -08:00
Jeff Brown
3f2aca62a4
Merge "Change desk dock to use accelerometer by default."
2011-11-21 15:40:22 -08:00
Eric Fischer
092ecfb373
am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
Import revised translations. DO NOT MERGE
2011-11-21 15:31:36 -08:00
Eric Fischer
c4411803fb
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:29:06 -08:00
Chia-chi Yeh
09839e416e
am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
...
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
SIP: turn off verbose logs.
2011-11-21 15:22:00 -08:00
Chia-chi Yeh
7ea0388c04
Merge "SIP: turn off verbose logs." into ics-mr1
2011-11-21 15:19:35 -08:00
Jamie Gennis
e3603d7d09
SurfaceTexture: fix a couple tests
...
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests. The tests previously
depended upon GL implementation details that should not have been relied
upon.
Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
2011-11-21 14:38:15 -08:00
Jamie Gennis
59769469e4
EGL: default to swap interval 1
...
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.
Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
2011-11-21 14:37:29 -08:00
Irfan Sheriff
797e5cc404
Merge "Add support for infinite dhcp lease time"
2011-11-21 14:34:47 -08:00
John Reck
e55526fb1c
am 0507ac4d: Use isHighEndGfx to determine texture pool
...
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
Use isHighEndGfx to determine texture pool
2011-11-21 14:14:06 -08:00
Jamie Gennis
6f4cdfe0db
SurfaceTexture: clean up some tests
...
This change cleans a few things up in the SurfaceTexture tests:
- Wraps a few long lines.
- Refactors the multithreading portions of SurfaceTextureGLToGLTest into
a new test fixture called SurfaceTextureGLThreadToGLTest.
- Changes some of the tests that were creating their own EGLSurface to
use the SurfaceTextureGLToGLTest fixture.
- Reorders the test functions so that they are immediately below to the
test fixture that they use.
Change-Id: I0491ce3528a7ff2b4f1e83602ba290269c087297
2011-11-21 11:52:02 -08:00
Jamie Gennis
89c1d61c16
EGL: Use cache sizes defined in the BoardConfig
...
This change introduces two new BoardConfig variables to control the size
limits of the EGL blob cache. MAX_EGL_CACHE_ENTRY_SIZE is the size
limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the
size limit for all entries in the entire cache (including both keys and
values). If either of these BoardConfig variables are not defined then
a default size limit is used instead.
Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
2011-11-21 11:48:17 -08:00
Kristian Monsen
9c9793dd6e
am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
...
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
Improving PictureListener deprecating comments
2011-11-20 07:31:41 -08:00
Kristian Monsen
2fa8f3f966
am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
...
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
Improving PictureListener deprecating comments
2011-11-20 07:29:09 -08:00
Kristian Monsen
2f399ff6ef
Merge "Improving PictureListener deprecating comments" into ics-mr1
2011-11-20 07:26:59 -08:00
Daniel Sandler
38c0f6968b
am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
...
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
Dreams (now Screen Candy) development.
2011-11-19 20:48:21 -08:00
Daniel Sandler
c05ee94e5f
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
...
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
2011-11-19 20:44:40 -08:00
Daniel Sandler
faed2acf61
Merge "Dreams (now Screen Candy) development." into ics-mr1
2011-11-19 20:42:19 -08:00
Jesse Wilson
5a0837cb14
Merge "Fix the backups example to use a simpler lock."
2011-11-19 09:09:58 -08:00
The Android Automerger
ce5c0d456a
merge in ics-mr0-release history after reset to ics-mr0
2011-11-18 22:01:43 -08:00
satok
bac9dee4a4
Merge "Do not merge. Fix a memory leak of a Binder in SpellCheckerService" into ics-mr0
2011-11-18 16:39:20 -08:00
Fabrice Di Meglio
8f8969834c
Merge "Fix TextLayoutCache Skia Typeface caching"
2011-11-18 16:32:43 -08:00
The Android Open Source Project
ec7f73e0cf
am 73b02758: am 0e2c2f39: Reconcile with ics-mr0-release
...
* commit '73b02758485b8a938318c608fcf828f660cced0d':
2011-11-18 15:56:59 -08:00