64768 Commits

Author SHA1 Message Date
Wu-cheng Li
e7005ec958 Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1 2011-11-21 18:10:52 -08:00
Michael Chan
20bfe4e68d Update description of account_type
Change-Id: Id929b3a75f86aa79423a0fe0520204ac88502f5b
2011-11-21 18:05:04 -08:00
Mathias Agopian
74b653e754 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:53 -08:00
Mathias Agopian
6d370ac037 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
f0401bc1fa 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
07a2d83190 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
8646cd42df Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1 2011-11-21 17:57:20 -08:00
Romain Guy
8cd39e3a10 Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1 2011-11-21 17:57:05 -08:00
Jamie Gennis
6deb4b538e SurfaceMediaSource: use the vid enc usage bit
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.

Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
2011-11-21 17:48:19 -08:00
Adam Powell
5f9447b0fe 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:37:08 -08:00
Adam Powell
fb0784da5f Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1 2011-11-21 17:34:57 -08:00
Romain Guy
d0609e41ab Ensure we have an EGL context when building layers
Bug #5638421

This bug was introduced by the recent changes that force more frequent
flushes of the GL renderer.

Change-Id: I55dd4ace6ba1e70ab41927150d6c60c37d7fb196
2011-11-21 17:21:15 -08:00
Mangesh Ghiware
31f263db65 Update zoom (aka display) density from WebView thread.
Fixes bug 5639675.

Change-Id: I982ca0787f5c050c5d1a288cd8751299ee351214
2011-11-21 17:19:31 -08:00
Adam Powell
05c8277f34 Fix bug 5521467 - Monkeys and ActionBar custom tab views
Remove custom tab views from old parents if applicable.

Change-Id: I7892f0f271e91a4fc9e26694557e82b81f3fd31a
2011-11-21 17:14:56 -08:00
Teng-Hui Zhu
f45aa7da2b HTML5 Video runs into super full screen mode
bug:5569146

Browser change
https://android-git.corp.google.com/g/#/c/151035/

Change-Id: Ib8449a670caf4aa2b540a170ed5e9f6adea2b12e
2011-11-21 16:56:08 -08:00
Amith Yamasani
45f06460e9 Fix an NPE on overflow in BatteryStats history.
When the battery stats buffer hits 128KB, it hits a code path
that causes an NPE. This can happen depending on usage and charging
patterns and manifest in bad ways, such as failure to boot up
or random crashes, or refusing to go to sleep.

Bug: 5645407
Change-Id: I21d5d189431f776f25bcb7d598c86e598ad8cb17
2011-11-21 16:08:34 -08:00
Nick Pelly
7dffeeefbb 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:33 -08:00
Nick Pelly
043a8b149d Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:40 -08:00
Jamie Gennis
834448eac5 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:17 -08:00
Jamie Gennis
9173eef644 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:15 -08:00
Jamie Gennis
b8d20d028c Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 2011-11-21 15:54:54 -08:00
Jamie Gennis
53cf20202a 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
aa8b33070b 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:32 -08:00
Eric Fischer
68f0d47e8e Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:29:06 -08:00
Eric Fischer
bf1b9778ce Import revised translations. DO NOT MERGE
Change-Id: I4313e0fffeb72b5a78b49770932ad983cfb05f8b
2011-11-21 15:23:51 -08:00
Chia-chi Yeh
556a757c67 am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
* commit 'bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
  SIP: turn off verbose logs.
2011-11-21 15:21:49 -08:00
Chia-chi Yeh
bfd85f9aca Merge "SIP: turn off verbose logs." into ics-mr1 2011-11-21 15:19:35 -08:00
Romain Guy
421458aad7 Draw in the correct FBO after invoking a GL functor
Bug #5650514

After invoking a GL functor, libhwui restores a few OpenGL states
including the current FBO. The renderer was however making the
wrong assumption that the FBO to restore to was the base layer
instead of the FBO associated with the current canvas state.

Change-Id: Ie565500832ebffd673f6a43b83422d6cc05470a0
2011-11-21 15:14:37 -08:00
Nick Pelly
a5cb9f4217 Replace vendor specific NfcGoogle.apk with generic Nfc.apk
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I09a81a896ff3cceb5a8de331d3399921b870932a
2011-11-21 14:55:29 -08:00
Jamie Gennis
caa4482a68 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
87f3265bb0 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
ced6262e93 am 0507ac4d: Use isHighEndGfx to determine texture pool
* commit '0507ac4d94fc0ecb775391a7e80c921614f88a58':
  Use isHighEndGfx to determine texture pool
2011-11-21 14:14:11 -08:00
John Reck
0507ac4d94 Use isHighEndGfx to determine texture pool
Bug: 5639612

Change-Id: I0ccbf74c2638b61b7eb0769c851e74700f0aa191
2011-11-21 13:30:32 -08:00
James Dong
96af14d9b0 Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f

related-to-bug: 5626569
2011-11-21 12:09:51 -08:00
Jamie Gennis
c10a94c4b8 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
6f0f0b1865 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
Romain Guy
31f2c2e946 Notify views when EGL resources are about to be destroyed
Bug #5639899

Change-Id: I7c5d8bebf02294426f5b3ab1358a31c38a4fd064
2011-11-21 10:55:41 -08:00
Wu-cheng Li
0cac6aa993 Move Camera.Sound to a stand-alone class CameraSound.
bug:5640219

Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926
2011-11-21 17:57:33 +08:00
Gilles Debunne
1a22db2927 IOOB in text selection.
Several issues here:

1. when selection has been set to size 0 (should not be possible, but see 2.),
moving any of the selection handles will create an IOOB because we add/substract 1
with no test. Added min/max.

2. the text change detection, which stop selection mode, was done in
handleTextChanged. We need to go deeper. Some methods (such as setText())
directly call the more atomic sendOnTextChange(). Moved the test down
to this method. As a result, pressing the 'x' button in the QuickSearchBox
correctly stops selection mode (it used to leave an empty selection).

This change may also solve some weird similar issues in extracted mode where
it is sometimes possible to end up with a 0-length selection.

It may also impact Bug 5555929 since spellCheckSpans will now be correctly
updated on ANY text change.

3. the before != after test is flawed. When this method is called, the text
has been changed and selection mode should be stopped even when the new text
happens to have the same size.

Change-Id: I869ef728662f4350f22ed6149dd42db193c333ed
2011-11-20 22:25:20 +01:00
Kristian Monsen
98dbf35ff3 am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
  Improving PictureListener deprecating comments
2011-11-20 07:28:35 -08:00
Kristian Monsen
7859c1842c Merge "Improving PictureListener deprecating comments" into ics-mr1 2011-11-20 07:26:59 -08:00
Daniel Sandler
75d8eb2a81 am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
2011-11-19 20:44:36 -08:00
Daniel Sandler
9b5d7a59f3 Merge "Dreams (now Screen Candy) development." into ics-mr1 2011-11-19 20:42:19 -08:00
The Android Automerger
1bca8f88bc merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 22:01:43 -08:00
Chia-chi Yeh
cb6ee06f62 SIP: turn off verbose logs.
Bug: 5616713
Change-Id: Iaf2e6878731d10d7f4f2a7cd8af71f4517780642
2011-11-18 16:57:21 -08:00
satok
e36657e541 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
4a8a67950e am 0e2c2f39: Reconcile with ics-mr0-release
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
2011-11-18 15:53:14 -08:00
The Android Open Source Project
0e2c2f3971 Reconcile with ics-mr0-release
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
2011-11-18 15:49:39 -08:00
The Android Automerger
0cd1fe7304 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 15:37:45 -08:00
Marco Nelissen
5b381ec95f am 7ff7821a: am d4b22ab4: status_t != bool
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
  status_t != bool
2011-11-18 15:10:38 -08:00