Glenn Kasten
086e2da211
am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
...
* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
2011-11-09 14:35:18 +00:00
Glenn Kasten
842caaa0af
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Jake Hamby
376193d656
am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
...
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
2011-11-08 22:02:49 +00:00
Brian Colonna
2e3f265633
am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
...
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix 5514230: preventing null window token from occurring
2011-11-08 22:02:48 +00:00
Jake Hamby
9db7f39431
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
2011-11-08 13:22:34 -08:00
Brian Colonna
211e1d4227
Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
2011-11-08 12:51:36 -08:00
Robert Greenwalt
0950014537
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Adam Powell
ccb01309ea
Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
2011-11-08 10:06:00 -08:00
Danielle Millett
acc37017ee
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
2011-11-08 10:03:24 -08:00
Robert Greenwalt
12c1aaafd5
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Tom Taylor
ad5385f1f0
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
2011-11-08 09:00:22 -08:00
Andreas Huber
4b50a6a902
Merge "Remove surface legacy APIs and code." into ics-mr1
2011-11-08 08:48:31 -08:00
John Reck
327714950f
Merge "Remove unnecessary memory allocations" into ics-mr1
2011-11-08 08:38:07 -08:00
Eric Laurent
9104b8c640
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
2011-11-08 08:32:57 -08:00
Narayan Kamath
951be81f21
Merge "Fix a bug in the network TTS api." into ics-mr1
2011-11-08 02:09:18 -08:00
Gilles Debunne
2240d7d0c4
Merge "No more context menu in TextView" into ics-mr1
2011-11-08 00:48:27 -08:00
Chih-Chung Chang
de89f8c6e6
Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1
2011-11-07 22:59:55 -08:00
James Dong
87e906a6de
Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
2011-11-07 22:57:02 -08:00
Matthew Xie
f8119b9d4a
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-07 22:42:00 -08:00
Mathias Agopian
a5f9676ecc
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
2011-11-07 21:33:53 -08:00
Daniel Sandler
7f65fd6024
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
2011-11-07 19:47:51 -08:00
Dianne Hackborn
604823323a
Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
2011-11-07 18:46:54 -08:00
Adam Powell
bed040b8ea
Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
2011-11-07 17:55:17 -08:00
John Wang
30b08ffb38
Merge "Remain in call audio mode while phone is offhook." into ics-mr1
2011-11-07 16:46:11 -08:00
Robert Greenwalt
514f0440c0
am b445362b: Make upstream tether list threadsafe
...
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
John Reck
f4a9a39b0b
Merge "Remove nativeRecordButtons" into ics-mr1
2011-11-07 15:20:38 -08:00
Adam Powell
4a55b46f07
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
2011-11-07 14:56:36 -08:00
Peter Ng
f3a601b176
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
2011-11-07 14:37:31 -08:00
Jim Miller
387b21efed
Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
2011-11-07 14:24:43 -08:00
Peter Ng
68d563b546
Merge "Color balancing framework assets" into ics-mr1
2011-11-07 13:40:45 -08:00
Eric Fischer
16364a0796
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:02 -08:00
Amith Yamasani
6532722306
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
2011-11-07 10:57:17 -08:00
Winson Chung
8241bb39c6
Merge "Fixing screenshot border asset." into ics-mr1
2011-11-07 10:20:37 -08:00
Daniel Sandler
70404410db
Merge changes I0da0f04f,I93197665 into ics-mr1
...
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
The Android Open Source Project
2642a74b99
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
2011-11-07 08:22:56 -08:00
The Android Automerger
0689c381b7
merge in ics-mr0-release history after reset to ics-mr0
2011-11-06 06:28:19 -08:00
Dianne Hackborn
1f0509b675
am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
...
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
Print out memory info when we get into a low memory situation.
2011-11-05 07:34:03 +00:00
The Android Automerger
d17aaaee47
merge in ics-mr0-release history after reset to ics-mr0
2011-11-05 00:33:21 -07:00
Dianne Hackborn
d119913c7f
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
2011-11-05 00:31:17 -07:00
Jeff Brown
06234b37e3
Fix a leak in Parcel::writeBlob.
...
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 22:16:39 -07:00
Mathias Agopian
2b0b7a92fc
Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
2011-11-04 19:57:59 -07:00
Jeff Brown
efd912c05c
am 5462bc63: Fix a leak in Parcel::writeBlob.
...
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
Fix a leak in Parcel::writeBlob.
2011-11-05 02:35:57 +00:00
Jeff Brown
93ff1f985e
Fix a leak in Parcel::writeBlob.
...
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 19:26:03 -07:00
Mathias Agopian
385977f6d6
workaround to set the WM refresh rate to 48 Hz for tuna devices only
...
this is TEMPORARY until we can do this properly.
Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
2011-11-04 18:46:11 -07:00
Romain Guy
60e2245b63
Merge "Memory optimizations for libhwui Bug #5566149 " into ics-mr1
2011-11-04 16:35:35 -07:00
Robert Greenwalt
7972d26cec
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
edc0bf5536
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
The Android Automerger
31f4de3e67
merge in ics-mr0-release history after reset to ics-mr0
2011-11-04 15:40:13 -07:00
Mathias Agopian
4a9ac37fe2
Fix rotation displays frame N-1 briefly while rotating
...
The ScreenShot layer is now created hidden. The screenshot itself
is aquired during the transaction when the layer is made visible.
This guarantees the screenshot and the layer happen atomically
with respect to screen updates.
Bug: 5534521
Change-Id: Ida23e1f13d5716ec83b78a15712e0646d6cf8729
2011-11-04 15:15:32 -07:00
Jamie Gennis
33e55a9545
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
2011-11-04 15:10:11 -07:00
