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
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
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
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
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
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
The Android Open Source Project
cd7f56fdd2
am 0e2c2f39: Reconcile with ics-mr0-release
...
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
2011-11-18 15:53:25 -08:00
The Android Open Source Project
e1b2b00d75
Reconcile with ics-mr0-release
...
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
2011-11-18 15:49:39 -08:00
The Android Automerger
14d47ba602
merge in ics-mr0-release history after reset to ics-mr0
2011-11-18 15:37:45 -08:00
Marco Nelissen
ddd2a1feb8
am 7ff7821a: am d4b22ab4: status_t != bool
...
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
2011-11-18 15:10:54 -08:00
Marco Nelissen
35ab318b31
am d4b22ab4: status_t != bool
...
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
2011-11-18 15:07:21 -08:00
Svetoslav Ganov
23a76d9a8d
am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
...
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
2011-11-18 14:41:29 -08:00
Svetoslav Ganov
c47b855401
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
2011-11-18 14:39:05 -08:00
Mathias Agopian
8b8a004148
don't report an error when disconnecting from an abandoned surfacetexture
...
this happens often with CPU Surfaces, which disconnect long
after their surfacetexture has been abandoned.
Change-Id: If49da03b72f99130e01b2b9bcbd444bb38f7ed4e
2011-11-18 14:32:35 -08:00
Wei Huang
8faf46afe3
am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
...
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
Unlock camera AWB lock only when white-balance is changed.
2011-11-18 14:02:44 -08:00
Wei Huang
45773c0574
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
2011-11-18 14:00:09 -08:00
Mathias Agopian
7c6eba6669
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
...
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.
this will hopefully resolve some performance issues.
Bug: 5553562, 5631630
Change-Id: I54c7a9e2068586898ab13e405d95534669260537
2011-11-18 13:50:35 -08:00
The Android Open Source Project
17ddb89806
am d5280e51: Reconcile with ics-mr0-release
...
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
2011-11-18 13:35:32 -08:00
Mathias Agopian
c4dd3a44c6
am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
...
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
attempt to fix bug 5313580
2011-11-18 13:35:23 -08:00
Bart Sears
708e9b4be5
am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
...
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
2011-11-18 13:35:14 -08:00
The Android Open Source Project
3540b77da3
Reconcile with ics-mr0-release
...
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
2011-11-18 13:12:33 -08:00
Mathias Agopian
6285c6cf10
Merge "attempt to fix bug 5313580" into ics-mr1
2011-11-18 12:11:15 -08:00
Bart Sears
3b244a74e1
Merge "Content and viewport rects set in one step." into ics-mr1
2011-11-18 11:46:26 -08:00
Svetoslav Ganov
3758a56f37
am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
...
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
Add the support libraries to the platform documentation (build).
2011-11-18 10:14:04 -08:00
Svetoslav Ganov
fc48e6b29e
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
2011-11-18 10:11:35 -08:00
Joe Fernandez
7ca2a20463
am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
...
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
docs: Camera Features for developers
2011-11-18 06:17:59 -08:00
Joe Fernandez
eb79157376
am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
...
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
docs: Camera Features for developers
2011-11-18 06:14:01 -08:00
Scott Main
df349c6d69
am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
...
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
docs: update caption for action bar figure to match new screenshot
2011-11-18 02:53:00 -08:00
Scott Main
da405c11f2
am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
...
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
docs: update caption for action bar figure to match new screenshot
2011-11-18 02:49:49 -08:00
Daniel Sandler
019837205e
am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
...
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
Tie screen saver to the screen off timeout.
2011-11-17 21:04:37 -08:00
Daniel Sandler
ba7232c6b3
Merge "Tie screen saver to the screen off timeout." into ics-mr1
2011-11-17 21:02:40 -08:00
Adam Powell
32f4fe5626
am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
...
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
2011-11-17 19:46:19 -08:00
Adam Powell
7be909033d
Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
2011-11-17 19:44:14 -08:00
Jim Miller
76e8b77c42
am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
...
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
2011-11-17 18:59:59 -08:00
Jim Miller
8d7d5097bd
Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1
2011-11-17 18:58:20 -08:00
Mathias Agopian
a36bcd53ac
attempt to fix bug 5313580
...
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.
To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.
Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
2011-11-17 18:46:09 -08:00