OSDN Git Service
Andreas Huber [Tue, 1 Feb 2011 00:18:49 +0000 (16:18 -0800)]
Disconnect HTTP live sessions as soon as the request comes in.
Instead of waiting until pending events have been processed.
Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug:
3409681
Gil Dobjanschi [Mon, 31 Jan 2011 09:16:32 +0000 (01:16 -0800)]
Bug fix:
3405930 Crash editing overlay text
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Bart Sears [Mon, 31 Jan 2011 03:59:02 +0000 (19:59 -0800)]
New DroidSansFallback font file from Ascender
Bug:
3315583
1) IPA (U+0250-U+02AF)
2) Currency symbols
3) U+02BB MODIFIER LETTER TURNED COMMA
4) Non-breaking hyphen ("\u2011")
5) Jamo U+11xx mappings
Change-Id: Ie4dfc7677d0f63c89ed0e1f6506cd513ae45ffa9
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:55:55 +0000 (16:55 -0800)]
Fix issue #
3381489: IllegalStateException: attempt to re-open...
...an already-closed object: android.database.sqlite.SQLiteQuery
It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list. In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).
This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.
A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.
Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 01:46:32 +0000 (17:46 -0800)]
I declare settings panel icon VICTORY!
Bug:
3396115
Change-Id: I72c46361506ec48bf3ebc9b84dbc476c301ce20c
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
John Reck [Mon, 31 Jan 2011 00:23:09 +0000 (16:23 -0800)]
Prevent SET_SCROLL_OFFSET spam from clogging tubes
Bug:
3393571
Limit the event queue to a single pending SET_SCROLL_OFFSET. The
problem on slashdot.org was that the event thread was being flooded
with SET_SCROLL_OFFSET messages faster than it could process them,
causing the handler to get jammed up.
Change-Id: Ia4a90a030959d0b3769067791089cdb261ae403a
Dharmaray Kundargi [Sun, 30 Jan 2011 04:48:05 +0000 (20:48 -0800)]
Merging the same files on top of tree.
Add support for .m4v Issue
3395600
Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
Wink Saville [Mon, 31 Jan 2011 00:16:20 +0000 (16:16 -0800)]
Add debug for tracking bug
3404006.
We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.
Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
Adam Powell [Mon, 31 Jan 2011 00:12:56 +0000 (16:12 -0800)]
Merge "Fix bug
3405899 - android.view.WindowManager$BadTokenException" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 00:01:36 +0000 (16:01 -0800)]
Merge "Fix issue #
3404571: Commit final APIs" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 00:00:52 +0000 (16:00 -0800)]
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
Gilles Debunne [Sun, 30 Jan 2011 23:49:38 +0000 (15:49 -0800)]
Merge "Auto-clearing setError popup" into honeycomb
Adam Powell [Sun, 30 Jan 2011 23:47:29 +0000 (15:47 -0800)]
Fix bug
3405899 - android.view.WindowManager$BadTokenException
Clear any pending runnables involved with TextViews when cursor
controllers are released
Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
Joe Onorato [Sun, 30 Jan 2011 23:38:30 +0000 (15:38 -0800)]
Check for the STATUS_BAR permission for the system UI properties.
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.
Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
Dheeraj Sharma [Sun, 30 Jan 2011 23:20:49 +0000 (15:20 -0800)]
Merge "Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
Dheeraj Sharma [Sun, 30 Jan 2011 23:08:12 +0000 (15:08 -0800)]
Merge "
3404665 Preview window is blank after returning from playing exported movie" into honeycomb
Jamie Gennis [Sun, 30 Jan 2011 23:00:44 +0000 (15:00 -0800)]
Merge "Reset ANativeWindow crop on buffer geometry changes." into honeycomb
Dheeraj Sharma [Sun, 30 Jan 2011 22:52:42 +0000 (14:52 -0800)]
3404665 Preview window is blank after returning from playing exported movie
Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
Dianne Hackborn [Sat, 29 Jan 2011 22:18:37 +0000 (14:18 -0800)]
Fix issue #
3404571: Commit final APIs
Change-Id: I7f01f8df9cfb82a9bb987e3df7c8eaa1c5aab81a
Daniel Sandler [Sun, 30 Jan 2011 21:36:47 +0000 (13:36 -0800)]
Merge "Dismiss the ticker early if the status bar is tapped." into honeycomb
Joe Onorato [Sun, 30 Jan 2011 21:18:16 +0000 (13:18 -0800)]
Merge changes I09e8c4eb,I91a0e05f into honeycomb
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
Joe Onorato [Sun, 30 Jan 2011 21:07:53 +0000 (13:07 -0800)]
Use a DateFormat that fits.
Bug:
3405724
Change-Id: I09e8c4ebf1d0142b8737fc1bf9500dee320332b7
Daniel Sandler [Sun, 30 Jan 2011 21:07:28 +0000 (16:07 -0500)]
Dismiss the ticker early if the status bar is tapped.
Tapping the ticker will still launch the notification's
contentIntent, but tapping anywhere else in the bar will
immediately hide the ticker.
Bug:
3365129
Change-Id: Ic1abd38fd4c5bdf32f3586b4e4aa5b833b11a9bd
Dheeraj Sharma [Sun, 30 Jan 2011 20:50:23 +0000 (12:50 -0800)]
Fix for issue
3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
The Android Open Source Project [Sun, 30 Jan 2011 20:40:32 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Joe Onorato [Sun, 30 Jan 2011 20:12:05 +0000 (12:12 -0800)]
Update the network info when the configuration changes.
Bug:
3405559
Change-Id: I91a0e05f2e6d1c7766b89ba4f96d87ce07783318
Gilles Debunne [Sun, 30 Jan 2011 20:08:25 +0000 (12:08 -0800)]
Auto-clearing setError popup
Bug
3403325
Error popup has to be dismissed whether or not the key was handled.
Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
Jeff Brown [Sun, 30 Jan 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
Dianne Hackborn [Sat, 29 Jan 2011 21:22:02 +0000 (13:22 -0800)]
Fix screen size compatibility mode.
Change-Id: I2c06bbb586b4e54fc7ec52ec914cf95a18006217
Joe Malin [Sun, 30 Jan 2011 17:45:59 +0000 (09:45 -0800)]
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
Daniel Sandler [Sun, 30 Jan 2011 06:37:13 +0000 (22:37 -0800)]
Merge "Fix broken intitial notification panel animation." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 06:27:16 +0000 (22:27 -0800)]
am
c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Daniel Sandler [Sun, 30 Jan 2011 06:24:09 +0000 (01:24 -0500)]
Fix broken intitial notification panel animation.
I also tuned the animation parameters a bit to get things to
look just a tiny bit smoother. The first run is still jerky
but it's not jumping all over the place in the wrong
direction.
Bug:
3404950
Change-Id: Id10c52f227e6d2db428dc860097023560d154356
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Dheeraj Sharma [Sun, 30 Jan 2011 05:29:49 +0000 (21:29 -0800)]
Fix for issue
3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
Dianne Hackborn [Sat, 29 Jan 2011 21:22:02 +0000 (13:22 -0800)]
DO NOT MERGE: Fix screen size compatibility mode.
Cherry-picked from HC.
Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
Ken Wakasa [Sun, 30 Jan 2011 02:02:09 +0000 (11:02 +0900)]
Follow up change to I741642ac
Fix wrong constant.
bug:
3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:59:11 +0000 (12:59 -0800)]
Merge
6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:53:52 +0000 (12:53 -0800)]
Tweak to make merges easier
Bug:
3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
Jason parks [Sat, 29 Jan 2011 20:02:19 +0000 (12:02 -0800)]
Merge "Update the encryption password when the device password is changed." into honeycomb
Eric Fischer [Sat, 29 Jan 2011 19:25:30 +0000 (11:25 -0800)]
am
5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 19:16:13 +0000 (11:16 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Andreas Huber [Sat, 29 Jan 2011 19:16:07 +0000 (11:16 -0800)]
am
b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Jean-Baptiste Queru [Sat, 29 Jan 2011 19:03:55 +0000 (11:03 -0800)]
Merge
0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
Jim Miller [Sat, 29 Jan 2011 19:00:28 +0000 (11:00 -0800)]
am
226e5756: (-s ours) Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:57:48 +0000 (10:57 -0800)]
Merge
d350dc04 from gingerbread
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
Eric Fischer [Sat, 29 Jan 2011 18:40:17 +0000 (10:40 -0800)]
am
3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Nick Pelly [Sat, 29 Jan 2011 18:40:07 +0000 (10:40 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Scott Main [Sat, 29 Jan 2011 18:40:01 +0000 (10:40 -0800)]
am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:38:09 +0000 (10:38 -0800)]
Merge
eab0e97b from gingerbread
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
Robert Greenwalt [Sat, 29 Jan 2011 18:26:33 +0000 (10:26 -0800)]
am
89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Dirk Dougherty [Sat, 29 Jan 2011 18:16:14 +0000 (10:16 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:10:02 +0000 (10:10 -0800)]
Merge
ba3dd323 from gingerbread
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
Scott Main [Sat, 29 Jan 2011 17:59:33 +0000 (09:59 -0800)]
am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Andreas Huber [Sat, 29 Jan 2011 17:55:13 +0000 (09:55 -0800)]
am
2dce338e: (-s ours) DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Dianne Hackborn [Sat, 29 Jan 2011 17:54:53 +0000 (09:54 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Sat, 29 Jan 2011 17:54:41 +0000 (09:54 -0800)]
am
2ba92c71: (-s ours) do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Kenny Root [Sat, 29 Jan 2011 17:48:07 +0000 (09:48 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:45:41 +0000 (09:45 -0800)]
Merge
c33acae9 from gingerbread
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
Mathias Agopian [Sat, 29 Jan 2011 17:40:51 +0000 (09:40 -0800)]
am
239fd805: (-s ours) 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)
Mathias Agopian [Sat, 29 Jan 2011 17:40:34 +0000 (09:40 -0800)]
am
1955a5c9: (-s ours) 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)
Mathias Agopian [Sat, 29 Jan 2011 17:40:25 +0000 (09:40 -0800)]
am
d0441f92: (-s ours) 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)
Mathias Agopian [Sat, 29 Jan 2011 17:40:14 +0000 (09:40 -0800)]
am
043a3cdd: (-s ours) 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)
Mathias Agopian [Sat, 29 Jan 2011 17:40:06 +0000 (09:40 -0800)]
am
d3fcd0a1: (-s ours) 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)
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:37:44 +0000 (09:37 -0800)]
Merge
f126ad3b from gingerbread
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
Marco Nelissen [Sat, 29 Jan 2011 17:32:05 +0000 (09:32 -0800)]
am
c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '
c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
Nick Pelly [Sat, 29 Jan 2011 17:31:56 +0000 (09:31 -0800)]
am
b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '
b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:40 +0000 (09:31 -0800)]
am
cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit '
cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:19 +0000 (09:31 -0800)]
am
14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '
14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Jeff Brown [Sat, 29 Jan 2011 17:27:55 +0000 (09:27 -0800)]
am
d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit '
d8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
satok [Sat, 29 Jan 2011 16:14:02 +0000 (01:14 +0900)]
Fix a bug that IME switch disappiers at switching IME subtype.
Bug:
3404788
Change-Id: I741642ac690a1b4c6ca1225ee271bffe39164170
Andreas Huber [Sat, 29 Jan 2011 15:30:57 +0000 (07:30 -0800)]
am
efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit '
efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Justin Ho [Sat, 29 Jan 2011 15:30:39 +0000 (07:30 -0800)]
am
28c4f69a: Updated checkbox assets
* commit '
28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
Arnaud Ferir [Sat, 29 Jan 2011 15:30:07 +0000 (07:30 -0800)]
am
5e81a6e2: Fix trace mismatch.
* commit '
5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
Sylvain Fonteneau [Sat, 29 Jan 2011 15:29:56 +0000 (07:29 -0800)]
am
c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit '
c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
John Wang [Sat, 29 Jan 2011 15:29:42 +0000 (07:29 -0800)]
am
93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '
93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:27:06 +0000 (07:27 -0800)]
Merge
c896d85c from gingerbread
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:17:22 +0000 (07:17 -0800)]
Merge
da01b4ab from gingerbread
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
Jeff Hamilton [Sat, 29 Jan 2011 15:09:21 +0000 (07:09 -0800)]
am
e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '
e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
Jim Miller [Sat, 29 Jan 2011 15:08:58 +0000 (07:08 -0800)]
am
42a46157: Fix
3379239: Catch exceptions from workaround for OOM.
* commit '
42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix
3379239: Catch exceptions from workaround for OOM.
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
Robert Greenwalt [Sat, 29 Jan 2011 14:35:57 +0000 (06:35 -0800)]
Merge "Don't use mobile networktype icon if not connected" into honeycomb
Justin Ho [Sat, 29 Jan 2011 06:51:51 +0000 (22:51 -0800)]
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
Justin Ho [Sat, 29 Jan 2011 06:28:40 +0000 (22:28 -0800)]
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
Jeff Brown [Sat, 29 Jan 2011 06:04:14 +0000 (22:04 -0800)]
Add "Use physical keyboard" option to system bar IME button.
Bug:
3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
Justin Ho [Sat, 29 Jan 2011 03:18:51 +0000 (19:18 -0800)]
Merge "New honeycomb sound set" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:59:12 +0000 (21:59 -0800)]
New honeycomb sound set
Change-Id: Iaf3062f57f613702ea946fdf65e02f6265342ad5
Joe Onorato [Sat, 29 Jan 2011 02:47:57 +0000 (18:47 -0800)]
Merge "999" into honeycomb
Joe Onorato [Sat, 29 Jan 2011 00:53:13 +0000 (16:53 -0800)]
999
Bug:
3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
Jaikumar Ganesh [Sat, 29 Jan 2011 02:45:14 +0000 (18:45 -0800)]
am
1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '
1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
John Reck [Sat, 29 Jan 2011 02:44:57 +0000 (18:44 -0800)]
am
398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '
398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
Jeff Hamilton [Sat, 29 Jan 2011 02:41:42 +0000 (20:41 -0600)]
resolved conflicts for merge of
dc54a8c7 to honeycomb-merge
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
Mathias Agopian [Sat, 29 Jan 2011 02:38:58 +0000 (18:38 -0800)]
Merge "fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
Mathias Agopian [Sat, 29 Jan 2011 02:23:24 +0000 (18:23 -0800)]
fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330