Jean-Baptiste Queru
fba7532531
am fc6d1ba9: Merge "Hide download manager." into froyo
...
Merge commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572' into kraken
* commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572':
Hide download manager.
2010-03-26 14:31:28 -07:00
Joe Onorato
e5d6809d45
am 89837b25: Merge "Fix StatusBarService deadlock for real this time." into froyo
...
Merge commit '89837b25c85929b29288fd42727c44093548fced' into kraken
* commit '89837b25c85929b29288fd42727c44093548fced':
Fix StatusBarService deadlock for real this time.
2010-03-26 14:31:23 -07:00
Daniel Sandler
1c1c8486e1
am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
...
Merge commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187' into kraken
* commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187':
Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
2010-03-26 14:31:17 -07:00
Jean-Baptiste Queru
881d7baebe
Merge "Hide download manager." into froyo
2010-03-26 12:25:11 -07:00
Joe Onorato
6c0bef2d9b
Merge "Fix StatusBarService deadlock for real this time." into froyo
2010-03-26 12:14:49 -07:00
Daniel Sandler
949270ac56
Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
2010-03-26 11:41:34 -07:00
Brad Fitzpatrick
e9a8c1c0d5
Merge "Clarify some Binder docs regarding things that are thread-local."
2010-03-25 21:02:46 -07:00
Mathias Agopian
3791f20082
Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number"
2010-03-25 20:22:58 -07:00
Mathias Agopian
988fce5ee5
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
...
this is to allow developpers to deal with potiential differences
between the softgl versions.
Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
2010-03-25 20:21:12 -07:00
Jim Miller
6cc5b453e6
Merge "Fix 2535700: Add support for enforcing password quality"
2010-03-25 19:54:15 -07:00
Marco Nelissen
460f3ef2b5
Merge "Remove spurious byte order marks from xml files."
2010-03-25 19:06:23 -07:00
Adam Powell
73f6599861
Merge "Fix bug 2544916 - Fun with AbsListView touch mode"
2010-03-25 18:55:47 -07:00
Mathias Agopian
ba5b381d01
Merge "fix [2545826] calling into gralloc with external lock held"
2010-03-25 18:42:34 -07:00
Dan Egnor
d1eeb2c682
Merge "Add "dumpsys diskstats" to get a dump of disk-free values."
2010-03-25 17:59:00 -07:00
Jack Palevich
58963a5ce8
Merge "GLSurfaceView pause and resume now synchronize with the GLThread."
2010-03-25 17:21:50 -07:00
Adam Powell
3d2cb69282
Merge "API refactoring for OverScroller."
2010-03-25 17:03:58 -07:00
The Android Open Source Project
a464ab8d98
merge from open-source master
...
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
2010-03-25 16:39:32 -07:00
Joe Onorato
8362952052
Merge "Fix 2495749 - System process crash when a notification switches sections."
2010-03-25 16:00:25 -07:00
Robert Greenwalt
d53e0cae58
Merge "Fix Tethering of multiple downstream ifaces."
2010-03-25 15:50:25 -07:00
Fred Quintana
c692215eb8
Merge "check for nulls"
2010-03-25 14:39:15 -07:00
Mathias Agopian
c8620b60d6
fix [2545826] calling into gralloc with external lock held
...
Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a
2010-03-25 14:34:49 -07:00
Patrick Scott
9be0f73596
Merge "Add .3gpp as the preferred extension for video/3gpp."
2010-03-25 13:27:57 -07:00
Daniel Sandler
0f680d0432
Merge "Use a more benign icon for ADB notifications."
2010-03-25 13:26:36 -07:00
Brad Fitzpatrick
016093a2c1
Merge "Better fix for gettid() sim-eng breakage from last night."
2010-03-25 13:22:15 -07:00
Jean-Baptiste Queru
ec0a306aa6
Merge "Hide download manager."
2010-03-25 12:35:22 -07:00
Dianne Hackborn
988f4f84ed
Merge "Dumb late-night typo."
2010-03-25 12:32:12 -07:00
Joe Onorato
45ccabbc26
Merge "Add window flags and window types to hierarchyviewer."
2010-03-25 11:54:12 -07:00
Jack Palevich
db2d62146e
Merge "Turn off thread logging (too many messages.)"
2010-03-25 11:54:10 -07:00
Neal Nguyen
4f0a3e0001
Merge "Refactoring PackageManagerHostTests helper functions into a utility class for easier sharing with future stress tests."
2010-03-25 11:09:38 -07:00
Mike Reed
6c078ebf5e
Merge "update dox that we ignore the exact parameter on computeBounds"
2010-03-25 11:04:02 -07:00
Jack Palevich
32a3e1f859
Merge "Add logging of GLSurfaceView pause/resume calls."
2010-03-25 10:53:10 -07:00
Grace Kloba
9455b1c4c2
Merge "Turn on plugin signature checking."
2010-03-25 10:32:22 -07:00
San Mehat
a2fbb2b1d3
Merge "MountService: Switch all Log -> Slog"
2010-03-25 10:20:44 -07:00
Chih-Chung Chang
4c0572b869
Merge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the (weak) reference to it, which caused (small) memory leaks."
2010-03-25 10:05:58 -07:00
Nick Pelly
18a3b0d772
Merge "Fix Phone App crash due to binary data in HSP/HFP stream."
2010-03-25 10:01:21 -07:00
Dave Sparks
c153c88d18
Merge "New lock/unlock sounds."
2010-03-25 08:24:24 -07:00
Leon Clarke
8b8f5d66d5
Merge " http://b/issue?id=2516676 Correctly scale the play button and youtube logo when embedded youtube videos are displayed at smaller than the suggested size."
2010-03-25 07:38:22 -07:00
Bjorn Bringert
b07d6761ef
Merge "Use a secure setting for default browser geolocation permissions"
2010-03-25 07:36:46 -07:00
Wu-cheng Li
3728d1c7ea
Merge "Fix testCameraPreviewMemoryUsage test."
2010-03-25 03:52:00 -07:00
Brad Fitzpatrick
3639d93c6d
Merge "Hopefully fix the sim-eng build, part 2."
2010-03-25 02:05:31 -07:00
Dianne Hackborn
e2cd7615b3
Merge "Fix issue #2543231 : chat invitation dialog does show all the time"
2010-03-25 01:02:32 -07:00
Amith Yamasani
47bb37ee95
Merge "Fix 2242164 Soft keyboard keeps getting enabled even if I disable it"
2010-03-24 22:26:10 -07:00
Jeff Brown
e1ec80cdb3
Merge "Ensure Binder finalizer handles partially initialized instances."
2010-03-24 20:06:41 -07:00
Grace Kloba
349d1a53ae
Merge "There are two computeHorizontalScrollRange() got missed in the last conversion."
2010-03-24 18:27:18 -07:00
Dan Egnor
b1ab077d68
Merge "Limit DropBox storage to 1000 files (by default)."
2010-03-24 18:13:41 -07:00
Irfan Sheriff
275cf85015
Merge "Fix WakeLock issue for driver stop"
2010-03-24 18:00:15 -07:00
Adam Powell
aa8f046667
Merge "Fix some bugs/edge cases in ScrollView/HorizontalScrollView"
2010-03-24 15:11:45 -07:00
Adam Powell
4bf32088f3
Merge "Fix for bug 2502886 - stupid monkeys."
2010-03-24 14:05:55 -07:00
Andreas Huber
93930f0936
Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."
2010-03-24 13:53:28 -07:00
Jack Palevich
1703c08c5e
Merge "Improve our EGL management when pausing / resuming."
2010-03-24 13:50:33 -07:00
