OSDN Git Service
Mike Lockwood [Mon, 14 Mar 2011 20:17:24 +0000 (13:17 -0700)]
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
Simon Wilson [Mon, 14 Mar 2011 18:40:17 +0000 (11:40 -0700)]
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
Daniel Sandler [Mon, 14 Mar 2011 18:37:12 +0000 (11:37 -0700)]
Merge "Workaround unknown ERI indices." into gingerbread
Gilles Debunne [Mon, 14 Mar 2011 18:30:17 +0000 (11:30 -0700)]
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
James Dong [Fri, 11 Mar 2011 21:38:02 +0000 (13:38 -0800)]
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
Ying Wang [Fri, 11 Mar 2011 18:17:49 +0000 (10:17 -0800)]
Merge "Dist com.android.nfc_extras.jar." into gingerbread
Robert Greenwalt [Fri, 11 Mar 2011 18:14:28 +0000 (10:14 -0800)]
Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
Robert Greenwalt [Thu, 10 Mar 2011 18:41:36 +0000 (10:41 -0800)]
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 01:07:27 +0000 (17:07 -0800)]
Merge "revert the surface purgatory list and dependent changes." into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:13:31 +0000 (16:13 -0800)]
revert the surface purgatory list and dependent changes.
6d0f6cb Revert "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [
3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug:
4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
Mathias Agopian [Thu, 10 Mar 2011 00:54:21 +0000 (16:54 -0800)]
Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:54:14 +0000 (16:54 -0800)]
Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
Mathias Agopian [Tue, 8 Mar 2011 02:00:20 +0000 (18:00 -0800)]
Merge "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
Mathias Agopian [Thu, 10 Feb 2011 02:38:55 +0000 (18:38 -0800)]
Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only
37c2a37 fix [
3408713] Dialog window invisible sometimes
d35c666 fix [
3385504] Surface flinger hang when adding dim surface
1723b04 fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger
Bug:
3513017
Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
Simon Wilson [Mon, 7 Mar 2011 23:39:19 +0000 (15:39 -0800)]
Merge "mms: mms wap push length check before pdu processing." into gingerbread
Lorenzo Colitti [Fri, 4 Mar 2011 01:04:07 +0000 (17:04 -0800)]
Merge "Add a protocol property to the APNs and use it." into gingerbread
Lorenzo Colitti [Fri, 4 Mar 2011 01:03:58 +0000 (17:03 -0800)]
Merge "Make setupDataCall take a protocol parameter." into gingerbread
Jeff Brown [Thu, 3 Mar 2011 22:42:14 +0000 (14:42 -0800)]
Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
Jeff Brown [Thu, 3 Mar 2011 04:49:06 +0000 (20:49 -0800)]
Only set KeyEvent long press flag when repeat count equals 1.
This fixes a Gingerbread regression.
Bug:
3507021
Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
Mike Lockwood [Thu, 3 Mar 2011 02:27:33 +0000 (18:27 -0800)]
Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
Simon Wilson [Thu, 3 Mar 2011 02:03:52 +0000 (18:03 -0800)]
Merge "Attempt to reduce problems from issue #
3183612" into gingerbread
Costin Manolache [Tue, 1 Mar 2011 20:25:21 +0000 (12:25 -0800)]
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:12:11 +0000 (13:12 -0800)]
Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:12:03 +0000 (13:12 -0800)]
Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:11:55 +0000 (13:11 -0800)]
Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:11:37 +0000 (13:11 -0800)]
Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
Xavier Ducrohet [Mon, 28 Feb 2011 20:24:01 +0000 (12:24 -0800)]
Merge "Merge
1911a6f7 into gingerbread. do not merge." into gingerbread
Jamie Gennis [Sun, 27 Feb 2011 23:27:22 +0000 (15:27 -0800)]
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
Svetoslav Ganov [Fri, 25 Feb 2011 07:56:52 +0000 (23:56 -0800)]
Merge "Use different version of CLDR data in DatePicker" into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:58 +0000 (14:44 -0800)]
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:52 +0000 (14:44 -0800)]
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
Alon Albert [Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)]
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread
Jason Chen [Thu, 24 Feb 2011 01:23:53 +0000 (17:23 -0800)]
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
Jamie Gennis [Wed, 23 Feb 2011 20:30:55 +0000 (12:30 -0800)]
Merge "egl: fixes for object refcounts" into gingerbread
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Alon Albert [Tue, 22 Feb 2011 18:31:26 +0000 (10:31 -0800)]
Merge "Support quoted parameters" into gingerbread
Maarten Hooft [Fri, 18 Feb 2011 01:17:40 +0000 (17:17 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
Robert Ly [Wed, 16 Feb 2011 01:44:56 +0000 (17:44 -0800)]
Merge "Adding package summary for nfc.tech package" into gingerbread
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread
Jamie Gennis [Fri, 11 Feb 2011 00:18:36 +0000 (16:18 -0800)]
Prevent SurfaceFlinger from using layer token 31.
Bug:
2964479
Change-Id: I81e948924bff35b8b300d409f2c09f3779bcdeec
Mathias Agopian [Wed, 9 Feb 2011 21:06:00 +0000 (13:06 -0800)]
Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 08:34:22 +0000 (00:34 -0800)]
Merge "More documentation updates for NFC." into gingerbread
Dirk Dougherty [Wed, 9 Feb 2011 07:24:22 +0000 (23:24 -0800)]
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 03:30:47 +0000 (19:30 -0800)]
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
Eric Fischer [Tue, 8 Feb 2011 18:00:24 +0000 (10:00 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:15 +0000 (15:46 -0800)]
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:11 +0000 (15:46 -0800)]
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
Gilles Debunne [Fri, 4 Feb 2011 23:46:06 +0000 (15:46 -0800)]
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
Joe Onorato [Fri, 4 Feb 2011 02:05:20 +0000 (18:05 -0800)]
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
Nick Pelly [Fri, 4 Feb 2011 00:27:51 +0000 (16:27 -0800)]
Merge "Fix docs type that broke build." into gingerbread
Scott Main [Thu, 3 Feb 2011 23:24:40 +0000 (15:24 -0800)]
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
Nick Pelly [Thu, 3 Feb 2011 23:23:17 +0000 (15:23 -0800)]
Merge "NFC documentation overhaul." into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)]
Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 00:38:25 +0000 (16:38 -0800)]
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]
Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]
Merge "fix for supporting 3 digits MNC code" into gingerbread
Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]
Merge "Final final final Gingerbread MR API changes." into gingerbread
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Kenny Root [Wed, 26 Jan 2011 17:17:28 +0000 (09:17 -0800)]
Merge "Make OBB results a one-way call" into gingerbread
Ritu Srivastava [Wed, 26 Jan 2011 00:23:08 +0000 (16:23 -0800)]
fix failing thread object run
A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.
Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>
Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:21 +0000 (14:43 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:14 +0000 (14:43 -0800)]
Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:09 +0000 (14:43 -0800)]
Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:05 +0000 (14:43 -0800)]
Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:42:59 +0000 (14:42 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
Jeff Hamilton [Tue, 25 Jan 2011 22:35:46 +0000 (14:35 -0800)]
Merge "Use classnames instead of ints for NFC techs." into gingerbread
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
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.
Mathias Agopian [Sat, 15 Jan 2011 01:37:42 +0000 (17:37 -0800)]
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.
Mathias Agopian [Fri, 17 Dec 2010 02:46:17 +0000 (18:46 -0800)]
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
Mathias Agopian [Wed, 15 Dec 2010 22:41:59 +0000 (14:41 -0800)]
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
Mathias Agopian [Tue, 14 Dec 2010 00:47:31 +0000 (16:47 -0800)]
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]
Merge "Increase the number of useful bits in the spectrum." into gingerbread
Hung-ying Tyan [Tue, 25 Jan 2011 05:13:08 +0000 (21:13 -0800)]
Merge "Get mute state from active call." into gingerbread
Hung-ying Tyan [Tue, 25 Jan 2011 03:41:42 +0000 (19:41 -0800)]
Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
John Wang [Mon, 24 Jan 2011 17:14:14 +0000 (09:14 -0800)]
Merge "Enable recovery in RIL wakelock release check." into gingerbread
Nick Pelly [Mon, 24 Jan 2011 06:12:25 +0000 (22:12 -0800)]
Merge "Add operands to mifare classic increment, decrement." into gingerbread