Jamie Gennis
64b365993b
Merge "egl: fixes for object refcounts"
2010-12-23 16:58:22 -08:00
Vasu Nori
6a4e5114ea
Merge "fix all flaky tests to make them work consistently."
2010-12-23 16:48:18 -08:00
Guang Zhu
f61dd1df33
Merge "bugfix: remove dump timeout message after dump is received"
2010-12-23 16:28:13 -08:00
Michael I. Gold
0c3ce2a365
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: I213b8be77b1a23b5a8a6afaac60643662c8aa010
2010-12-23 16:12:19 -08:00
Eric Fischer
30fb279543
Merge "Import revised translations."
2010-12-23 14:46:23 -08:00
Guang Zhu
5af7dad41d
Merge "Throw exception if webview dump times out"
2010-12-23 14:44:15 -08:00
Dianne Hackborn
dbf4fe4929
am cc43401c: am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
...
* commit 'cc43401cd10c681238e0be01de8fe14f5da94fb1':
frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:29:36 -08:00
Jeff Brown
530caefeac
am fa93584a: (-s ours) am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
...
* commit 'fa93584a4fab6ca8d9348658dc30cedf76891753':
Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 14:27:29 -08:00
Dianne Hackborn
6a7a699f3c
am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
...
* commit '6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:22:32 -08:00
Dianne Hackborn
0e6375a789
Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
2010-12-23 14:19:03 -08:00
Dianne Hackborn
d3994f5183
Merge "frameworks/base: Fix to release references to previous live wallpaper"
2010-12-23 14:17:54 -08:00
Dianne Hackborn
37d273cbf0
Merge "frameworks/base: Fix to release references in ActivityManagerService"
2010-12-23 14:14:38 -08:00
Andreas Huber
bc5a30b42b
Merge "Squashed commit of the following:"
2010-12-23 13:11:29 -08:00
Jaikumar Ganesh
8372c603d8
Merge "Expose insecure rfcomm Bluetooth API."
2010-12-23 13:06:50 -08:00
Jeff Brown
f71751848b
am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
...
* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 12:43:48 -08:00
Jeff Brown
37cc46a0b4
Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
2010-12-23 12:41:59 -08:00
Shimeng (Simon) Wang
3bd5db7c26
Merge "Merge WebKit at r73109: update web_user_agent string."
2010-12-23 11:41:54 -08:00
Gilles Debunne
daf99bc878
Merge "Fix for ellipsized text that has two lines at maximum."
2010-12-23 11:20:48 -08:00
Irfan Sheriff
391179e8dc
Merge "Fix wifi broadcasts"
2010-12-23 09:17:39 -08:00
Kristian Monsen
7e97c08aff
Merge "Only store Application context"
2010-12-23 07:35:40 -08:00
Shih-wei Liao
f51893c24e
Merge "Clean-up."
2010-12-23 07:08:54 -08:00
Xavier Ducrohet
8f00ee5513
Merge "LayoutLib: improve bitmap support."
2010-12-23 00:13:24 -08:00
Xavier Ducrohet
bc655f005e
Merge "LayoutLib: support for layers."
2010-12-23 00:09:07 -08:00
Dianne Hackborn
54e2f4b05c
am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
...
* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:40:56 -08:00
Dianne Hackborn
6314ef2b8a
am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
...
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
947d92c963
Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
2010-12-22 18:34:40 -08:00
Jeff Brown
2ff72374bf
Merge "Enable touch splitting by default for Honeycomb apps."
2010-12-22 18:29:19 -08:00
Dianne Hackborn
94b6282c2d
Merge "Fix issue #3299143 : Problem report for Hanping Chinese Dictionary Pro"
2010-12-22 17:44:14 -08:00
Jim Miller
d2814cba14
Merge "Fix 3298264: Update LockScreen DigitalClock with new font"
2010-12-22 17:35:26 -08:00
Jeff Brown
e7a0d2beea
Fix policy issues when screen is off. (DO NOT MERGE)
...
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).
Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.
Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.
Bug: 3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
2010-12-22 16:00:21 -08:00
Dianne Hackborn
e378635c8d
am 0dc0dab7: am 3b10aea5: Merge "Improve performance of WindowState.toString()"
...
* commit '0dc0dab71024e07431eb6d20b6165822da734902':
Improve performance of WindowState.toString()
2010-12-22 15:00:08 -08:00
Dianne Hackborn
b6e30edf0c
am 3b10aea5: Merge "Improve performance of WindowState.toString()"
...
* commit '3b10aea50c1044ff33d02727829c47c061f6e1c8':
Improve performance of WindowState.toString()
2010-12-22 14:56:50 -08:00
Jim Miller
896a3c6ac7
Merge "Fix 3290446: Reduce number of recents to fit in a single binder"
2010-12-22 14:27:25 -08:00
Martin Hibdon
b340faaf89
Merge "Correctly save Activity's state in saveInstanceState"
2010-12-22 14:08:42 -08:00
James Dong
000c40f6cc
am 27d4ad2a: (-s ours) am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
...
* commit '27d4ad2a5771ad025fa69f64b093d7429d94bfd3':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:44:22 -08:00
James Dong
e5a94699e1
am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
...
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
2010-12-22 12:40:57 -08:00
James Dong
7bc0c0a8b7
Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
2010-12-22 12:38:11 -08:00
Dianne Hackborn
a0d276683f
Merge "Fix issue #3194697 : default orientation for portrait-mode apps on stingray is backward?"
2010-12-22 12:33:40 -08:00
Mattias Petersson
96dcf8ef1f
am 2f209e88: am 1622eee2: Improve performance of WindowState.toString()
...
* commit '2f209e885a86b8396fe1344043cf9858751fcb64':
Improve performance of WindowState.toString()
2010-12-22 12:04:43 -08:00
Jeff Hamilton
83f509e3cf
am 7a9f17c3: am 3ce86481: Remove canBeFormatted().
...
* commit '7a9f17c3563be3eb5fc0927e20d9bc7ec09e20c3':
Remove canBeFormatted().
2010-12-22 12:04:32 -08:00
James Dong
559810e779
Merge "Avoid using private Bitmap constructor to generate bitmaps"
2010-12-22 12:03:39 -08:00
Hung-ying Tyan
1ec8d0dd0c
am aec9a33f: am e0bd2688: Merge "Check if VoIP API is supported in SipManager." into gingerbread
...
* commit 'aec9a33f1cfc7c32690bc8e24aefaeb137ab9859':
Check if VoIP API is supported in SipManager.
2010-12-22 11:35:14 -08:00
Robert Greenwalt
3aefb532a4
am 46f98746: am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
...
* commit '46f987465c1df4ec984e725747d4d79fc592abb7':
Be sure and report NO_CONNECTIVITY when needed.
2010-12-22 11:35:06 -08:00
Dianne Hackborn
1c2601251d
am 20c915d8: am 5261cea2: Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
...
* commit '20c915d80356859d8716f014a7d4950f06c38cfc':
Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s.
2010-12-22 11:34:59 -08:00
Jean-Baptiste Queru
dba1337896
am b3177c13: (-s ours) am 749c627f: Merge "Support for KSC5601 on SIM."
...
* commit 'b3177c135bb7a3db3318893335a9ac0bc39d9cf8':
Support for KSC5601 on SIM.
2010-12-22 11:34:50 -08:00
Simon Wilson
2cbb0230e7
am 490db31b: (-s ours) am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
...
* commit '490db31b851af9195f8f5bd4c5b21f59be56b207':
fix [3127755] Launcher is missing anti-aliasing
2010-12-22 11:29:07 -08:00
Mattias Petersson
de0fd15bdc
am 1622eee2: Improve performance of WindowState.toString()
...
* commit '1622eee2e48678b17a4668641957f09213f98905':
Improve performance of WindowState.toString()
2010-12-22 11:25:32 -08:00
Dianne Hackborn
0ca8fbb1cc
Merge "Improve performance of WindowState.toString()"
2010-12-22 11:21:21 -08:00
Andreas Huber
2d0e696dea
Merge "Distinguish discontinuities w/ a format change from those without."
2010-12-22 10:17:03 -08:00
Jeff Hamilton
044c2f2606
am 3ce86481: Remove canBeFormatted().
...
* commit '3ce86481cbde92e2cb6fe3a46cbedd8b2a5c4b48':
Remove canBeFormatted().
2010-12-22 09:42:16 -08:00