41810 Commits

Author SHA1 Message Date
Costin Manolache
d606045070 If 'customTokens', let authenticator handle notification.
Bug: 3377952
Change-Id: Iffb0ed01c39b42838cf88fd1b332c4b41c3194ec
2011-01-25 15:28:44 -08:00
Dianne Hackborn
a58552e03d am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb
* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
2011-01-25 15:25:39 -08:00
Dianne Hackborn
f95bd0feb5 Merge "Argh forget to include my final part of the change." into honeycomb 2011-01-25 15:23:13 -08:00
Mike Lockwood
8151dc3229 StagefrightMediaScanner: Close metadata retriever after we are done scanning
This prevents the mediaserver from leaking a file descriptor after
the media scanner runs

BUG: 3373546

Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:20:04 -08:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
2011-01-25 15:19:17 -08:00
Dianne Hackborn
8fca2eccb0 Merge "New extra for GET_CONTENT." into honeycomb 2011-01-25 15:17:50 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT.
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
2011-01-25 15:16:55 -08:00
Brad Fitzpatrick
a206efcf8d Merge "android.os.Message: respect sPoolSize" 2011-01-25 15:12:18 -08:00
Mike Lockwood
071b2b6739 MTP: Fix race conditions in MtpServer JNI code
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:10:31 -08:00
Brad Fitzpatrick
2405c278ef android.os.Message: respect sPoolSize
Also rename some static members from mFoo to sFoo.

Bug: http://code.google.com/p/android/issues/detail?id=13866
Change-Id: I5c5075eb6f529d1534c7aa72b6881873cd08676a
2011-01-25 14:54:31 -08:00
Dianne Hackborn
f812fee071 Argh forget to include my final part of the change.
Change-Id: I1e2711e1ecde0350047f1edef9a59947ff5749eb
2011-01-25 14:54:29 -08:00
Justin Ho
18cc1f2cb6 New contact picture
Change-Id: Ic601c375df6117c5e974f39d4a75ccef45e6912c
2011-01-25 14:54:08 -08:00
Adam Powell
e0c148484e am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb
* commit '5dcc9bd7261d6b19135bf972cf603b355b5316f4':
  Fix bug 3387855 - Menu flashes on left side of screen
2011-01-25 14:50:34 -08:00
Santosh Madhava
d645172123 am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
  Fix for issue 3385068 : Play gets out of sync
2011-01-25 14:48:28 -08:00
Scott Main
108841ff94 am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb
* commit '31e5c30f0240fce5d39abfcbd25cf715b00ec019':
  docs: revise and amend platform notes for preview
2011-01-25 14:48:19 -08:00
Jeff Brown
391ef42c92 am 3168a137: Merge "Fix surface frame size reporting." into honeycomb
* commit '3168a13723ff0f3f87937457fe33c3518caa4bb9':
  Fix surface frame size reporting.
2011-01-25 14:48:14 -08:00
Gilles Debunne
7a41782195 am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb
* commit '47fc854ae9947e0fe5ca0e33e22a41618ba7523b':
  Fix for a call to startActivity from outside of an app.
2011-01-25 14:48:08 -08:00
Adam Powell
5dcc9bd726 Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb 2011-01-25 14:46:47 -08:00
Mathias Agopian
df8368925a am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 14:46:40 -08:00
Mathias Agopian
af4fa5d83d am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 14:46:35 -08:00
Mathias Agopian
6b72702f30 am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 14:46:31 -08:00
Mathias Agopian
2d665dd37a am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 14:46:27 -08:00
Mathias Agopian
88bccab35c am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
  minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-25 14:46:22 -08:00
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Mathias Agopian
239fd805ef Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:21 -08:00
Mathias Agopian
1955a5c9da Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:14 -08:00
Mathias Agopian
d0441f921b Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:09 -08:00
Mathias Agopian
043a3cddf6 Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread 2011-01-25 14:43:05 -08:00
Mathias Agopian
d3fcd0a1c9 Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread 2011-01-25 14:42:59 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
2011-01-25 14:41:55 -08:00
Adam Powell
e2b03a62e5 Fix bug 3387855 - Menu flashes on left side of screen
Post popup menu click events rather than executing inline so that the
popup can close undisturbed.

Change-Id: I01481bd37d7921c10c6b8b484eab33f0d25447ff
2011-01-25 14:40:36 -08:00
Jeff Hamilton
f126ad3b64 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs.
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
2011-01-25 16:32:26 -06:00
Scott Main
31e5c30f02 Merge "docs: revise and amend platform notes for preview" into honeycomb 2011-01-25 14:21:28 -08:00
Jeff Brown
3168a13723 Merge "Fix surface frame size reporting." into honeycomb 2011-01-25 14:21:00 -08:00
Gilles Debunne
47fc854ae9 Merge "Fix for a call to startActivity from outside of an app." into honeycomb 2011-01-25 14:20:09 -08:00
Mathias Agopian
21956040a7 fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.

The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.

This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.

Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.

now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.

noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
2011-01-25 14:19:13 -08:00
Mathias Agopian
68d3478860 partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.

So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.

NOTE: This doesn't entirely fix 3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.

also improve SurfaceFlinger 'dumpsys' log

list the purgatory, which shows windows that have been closed,
but for which the client still has references.
2011-01-25 14:19:13 -08:00
Mathias Agopian
8aa11d82f3 fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.

Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
2011-01-25 14:18:58 -08:00
Mathias Agopian
84c6f5a44c workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.

Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
2011-01-25 14:18:29 -08:00
Mathias Agopian
728d849fc9 minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
2011-01-25 14:18:15 -08:00
Scott Main
7afdaf0b9c docs: revise and amend platform notes for preview
Change-Id: Ief10e85ae7c1a9c56381342e0f3b880ebe57d8ca
2011-01-25 14:09:11 -08:00
Dianne Hackborn
a290977312 am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb
* commit '4426f643ec3833e830bc2f9b8af5088343de1315':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
2011-01-25 14:08:10 -08:00
Dianne Hackborn
4426f643ec Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb 2011-01-25 14:06:01 -08:00
Justin Ho
6954e9b0d9 am d00d2925: Merge changes I282a8421,I53d15f37 into honeycomb
* commit 'd00d2925ca9997c2f0fab1a8b149d91d77b79010':
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
2011-01-25 14:03:55 -08:00
Justin Ho
d00d2925ca Merge changes I282a8421,I53d15f37 into honeycomb
* changes:
  Merging Gingerbread assets into Honeycomb
  Removing old assets from SystemUI in drawable-hdpi
2011-01-25 14:01:25 -08:00
Jaikumar Ganesh
e4d494b495 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
2011-01-25 14:00:32 -08:00
Romain Guy
535602fe55 am 3ac1b0f0: Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb
* commit '3ac1b0f0d4d78568faf7616b2a8b808bdf5c4882':
  Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339
2011-01-25 13:58:08 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Romain Guy
3ac1b0f0d4 Merge "Prevent crash in View when gathering attributes without an AttachInfo. Bug #3385339" into honeycomb 2011-01-25 13:55:14 -08:00