Commit Graph

13607 Commits

Author SHA1 Message Date
Romain Guy
3a22b0982a Merge "Tame the monkey. Bug #2547546" into froyo 2010-03-29 13:00:42 -07:00
Dirk Dougherty
37f9b40168 Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 2010-03-29 13:00:37 -07:00
Andreas Huber
36b3cfdfe2 Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo 2010-03-29 12:58:03 -07:00
Romain Guy
e71096b88b Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Jack Palevich
4b1409812a Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Romain Guy
7416faf474 Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
Daniel Lehmann
f4edb1a5e7 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
472cc8e787 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Dirk Dougherty
b77145f07b Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-26 18:25:05 -07:00
Dianne Hackborn
aabe5c8201 Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -07:00
Dirk Dougherty
b064ca2ed8 Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-26 17:50:26 -07:00
Romain Guy
23d74e222d Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:30:40 -07:00
Dirk Dougherty
31cfa6050b Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 16:27:07 -07:00
Jean-Michel Trivi
e6be51a9e4 Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:17:38 -07:00
Grace Kloba
7d840798d0 Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:30:26 -07:00
Grace Kloba
afa2eac17a Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 2010-03-26 13:55:34 -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