Commit Graph

17556 Commits

Author SHA1 Message Date
Gilles Debunne
83d390f8fc Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
ae4c508672 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Joe Onorato
51a2bdc437 Merge "Managed dialogs should run on the same thread as their activity." into gingerbread 2011-02-03 18:05:20 -08:00
Nick Pelly
344ff4b82c Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Scott Main
71d29541b4 Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 2011-02-03 15:24:40 -08:00
Nick Pelly
eef4bf96a1 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Jean-Baptiste Queru
c9b062ecde Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
2011-02-03 14:05:23 -08:00
Jean-Baptiste Queru
81f81875bc Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread 2011-02-03 14:02:59 -08:00
Jean-Baptiste Queru
60bcbd0eae Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
05e90f057a Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Scott Main
eba0a98abd 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 2011-02-02 16:38:25 -08:00
Jean-Baptiste Queru
907b884345 Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
5e06b988ab Merge "fix for supporting 3 digits MNC code" into gingerbread 2011-02-02 09:44:16 -08:00
Nick Pelly
790911fae0 Merge "Final final final Gingerbread MR API changes." into gingerbread 2011-02-01 09:39:31 -08:00
Dianne Hackborn
1059827471 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Eric Fischer
1e01e3de0b Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-31 16:08:52 -08:00
Jean-Baptiste Queru
02bac86968 Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
2011-01-30 15:30:03 -08:00
Jean-Baptiste Queru
9b1515590c Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
a7ba815307 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Robert Greenwalt
62e5b62d7f Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Eric Fischer
bb3356d637 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Dirk Dougherty
11057a96fd Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Eric Laurent
f8edaa87a6 Merge "Fix issue 2988031." into gingerbread 2011-01-27 18:37:04 -08:00
Jim Miller
ddccfdc3d4 Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 2011-01-27 18:22:14 -08:00
Nick Pelly
d4e1ed1fff Merge "API: Make close() throw an IOException." into gingerbread 2011-01-27 16:23:35 -08:00
Eric Fischer
77c85a0ead Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-27 14:56:29 -08:00
Scott Main
e000729397 Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread 2011-01-27 13:25:10 -08:00
Nick Pelly
07a30ef34b Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Robert Greenwalt
08f897d2b3 Merge "Update networktype before sending state change." into gingerbread 2011-01-27 10:17:33 -08:00
Scott Main
e0f78c41aa Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 2011-01-26 17:52:08 -08:00
Dianne Hackborn
afb1ae6448 Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 2011-01-26 13:59:42 -08:00
Kenny Root
30acaa8851 Merge "Make OBB results a one-way call" into gingerbread 2011-01-26 09:17:28 -08:00
Ritu Srivastava
5ee1a0c5ee 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>
2011-01-25 21:48:54 -08:00
Jeff Hamilton
1b9429f227 Merge "Fix the build, proper current.xml." into gingerbread 2011-01-25 16:11:37 -08:00
Mathias Agopian
01749e731c 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
e3f0ec9f87 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
2462602edf 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
78bd4f68a9 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
9bfe965ae7 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
d69b1cc4b1 Merge "Use classnames instead of ints for NFC techs." into gingerbread 2011-01-25 14:35:46 -08:00
Mathias Agopian
d1a99ec6b2 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
53a67e1663 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
cfb676f1ae 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
5dc7e7da92 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
a0c6b76173 minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
2011-01-25 14:18:15 -08:00
Marco Nelissen
802c092a8a Merge "Increase the number of useful bits in the spectrum." into gingerbread 2011-01-25 10:06:16 -08:00
Hung-ying Tyan
ec889c108b Merge "Get mute state from active call." into gingerbread 2011-01-24 21:13:08 -08:00
Hung-ying Tyan
c9af508cb2 Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-24 19:41:42 -08:00
John Wang
c5da08b788 Merge "Enable recovery in RIL wakelock release check." into gingerbread 2011-01-24 09:14:14 -08:00
Nick Pelly
c6547f4f92 Merge "Add operands to mifare classic increment, decrement." into gingerbread 2011-01-23 22:12:25 -08:00