Fabrice Di Meglio
92eaa745af
Merge "Fix bug #2449594 (device should fold RRULEs, etc., that are longer than 75 chars)"
2010-02-23 17:02:36 -08:00
Eric Fischer
80f5b88171
Merge "Fix rounding of extra spacing when it is negative."
2010-02-23 16:45:41 -08:00
Romain Guy
5a407dc622
Merge "Remove unused private assets from Android 1.0."
2010-02-23 16:01:37 -08:00
James Dong
dabd65134c
Merge "Use Java API from xml configuration in the test application"
2010-02-23 15:42:28 -08:00
Dmitry Shmidt
7b7a0e5454
Merge "Add Arp Cache dump"
2010-02-23 15:25:46 -08:00
Joe Onorato
8d5fea429e
Merge "Remove never-used dead code from BackupManager"
2010-02-23 15:09:49 -08:00
Jim Miller
18de5df691
Merge "Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils."
2010-02-23 14:16:46 -08:00
Mathias Agopian
0d3cdb6615
Merge "remove a dependency of surfaceflinger on libskia"
2010-02-23 12:52:28 -08:00
Doug Zongker
d5bf026829
Merge "fix error in javadoc"
2010-02-23 12:37:53 -08:00
Adam Powell
4576f92774
Merge "Fixing pressed state in preferences, addresses bug 2310741"
2010-02-23 12:09:07 -08:00
Dan Egnor
153bd22a57
Merge "Update AccountManager's javadoc."
2010-02-23 11:57:13 -08:00
Eric Laurent
34248170a7
Fix issue 2305382: Pick up original call makes a noisy beep when wired headset connected.
...
The noise is the residual ring tone that is still playing while the call is answered and the
audio route changed to headset or earpiece.
The fix consists in muting the ringing tone when changing mode from ringtone to in call
and delaying the route change until the audio buffers are emptied.
2010-02-23 11:00:56 -08:00
Brett Chabot
d2c1705ddf
Merge "Add ability to run tests restricted to given annotation."
2010-02-23 10:46:42 -08:00
Mike Lockwood
01cfb8060f
Merge "Move LocationTracker from com.google.android to com.android package."
2010-02-23 10:34:52 -08:00
Andreas Huber
f4610d99bf
Merge "Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4."
2010-02-23 10:30:48 -08:00
James Dong
000073b315
Merge "Replace system property retrieval calls with DecoderCapabilities Java API calls."
2010-02-23 10:16:57 -08:00
Kenny Root
9e333ab42c
Use UTF-8 strings to avoid duplicate caching, part 1
...
StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.
This is part 1. Part 2 will include ResXMLParser optimizations.
Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
2010-02-23 10:02:20 -08:00
Bjorn Bringert
fc10cf951a
Merge "Clean up global search and web search activity finding"
2010-02-23 06:28:31 -08:00
Mike Lockwood
7fcf1808cc
Merge "Move LocationTracker test app from vendor/google to frameworks/base/tests"
2010-02-22 20:58:43 -08:00
Dianne Hackborn
33c9810e19
Merge "Fix some random bugs."
2010-02-22 20:48:01 -08:00
Mike Lockwood
b6ca55ba68
Merge "Don't start location providers until the system is ready."
2010-02-22 20:39:24 -08:00
Oscar Montemayor
0c757be75c
Merge "Fix bug when adding SET_INSTALL_LOCATION to SettingsProvider database, upgrade path."
2010-02-22 18:16:32 -08:00
Guang Zhu
802b3cf74d
Merge "Quick fix layout test path problems"
2010-02-22 17:50:31 -08:00
Mathias Agopian
eda65400f5
remove a dependency of surfaceflinger on libskia
...
libskia was only used for a small part of SkTransform. We now implement
Transform is surfaceflinger directly.
2010-02-22 17:30:40 -08:00
Jason Sams
c0014f1bab
Merge "beging np2 extension check work."
2010-02-22 17:06:21 -08:00
Romain Guy
cd84b8d285
Merge "Calling super.finalize() in finalize() methods. Also cleanup code, mostly removing unused handlers and casts."
2010-02-22 17:01:41 -08:00
Romain Guy
375ce11803
Merge "Prevent crash in AbsSpinner when the selection is out of sync. Bug #196253 "
2010-02-22 17:01:26 -08:00
Daniel Sandler
04845e4860
Merge "Show the USB mass storage UI as soon as USB is connected."
2010-02-22 16:46:08 -08:00
Adam Powell
a6b6dc021c
Merge "Standard alert dialogs overscroll only when content scrolls"
2010-02-22 16:36:38 -08:00
Andreas Huber
fbbf8ee52e
Merge "Properly unload the renderer shared library after the renderer goes away."
2010-02-22 16:34:32 -08:00
Brad Fitzpatrick
afe19f52cb
Merge "Reduce SQLiteDatabase and ContentResolver EventLog logging thresholds."
2010-02-22 16:32:25 -08:00
Gloria Wang
60de30c22c
Merge "Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE, but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning."
2010-02-22 16:08:28 -08:00
Andreas Huber
2b3f5e0541
Merge "This hardware video decoder lies about its required input buffer sizes allocating 2.7 MB of memory instead of the required 176 KB... Added another quirk."
2010-02-22 15:32:14 -08:00
Mathias Agopian
d2fa75683a
Merge "remove a dependency of GraphicBuffer (libui) on Parcel (libbinder)."
2010-02-22 14:39:55 -08:00
Romain Guy
65229b542a
Merge "Fix bug where calling getButton(int) returns null."
2010-02-22 14:17:52 -08:00
Oscar Montemayor
eea35cb101
Merge "Better file permissions enforcement on system keystore."
2010-02-22 14:15:00 -08:00
Adam Powell
1fc4284b0f
Merge "Don't switch layout modes in AbsListView#onTouchModeChanged() Don't stomp mResurrectToPosition for LAYOUT_SPECIFIC in AbsListView#hideSelector()"
2010-02-22 14:14:46 -08:00
San Mehat
6a8e314e93
Merge "MountService: Force unmount when enabling ums"
2010-02-22 13:21:58 -08:00
Vasu Nori
49d05b9859
Merge "fix race condition introduced by CL https://android-git.corp.google.com/g/40395 "
2010-02-22 12:58:44 -08:00
Dianne Hackborn
fa7cf0e151
Merge "Fix missing UI_MODE_SERVICE rename."
2010-02-22 12:57:41 -08:00
Bjorn Bringert
4f6556c573
Merge "Don't start global search from system dialogs"
2010-02-22 12:57:13 -08:00
Dianne Hackborn
6517a431e6
Merge "Fix issue #2438980 : Implement package watcher for voice recognizer service setting"
2010-02-22 12:18:01 -08:00
Eric Laurent
5e3ff60875
am 8978547f: am f5fe3949: Fix issue 2459650.
...
Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a'
* commit '8978547f254b6b6ba2e322794aa044803f3edc2a':
Fix issue 2459650.
2010-02-22 11:19:51 -08:00
Eric Laurent
3cf9cd5b62
am f5fe3949: Fix issue 2459650.
...
Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp
* commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b':
Fix issue 2459650.
2010-02-22 11:13:08 -08:00
Joe Onorato
c08d6d3bf2
Merge "Ignore touch down events near the edge of the screen for the purposes of pulling down the windowshade."
2010-02-22 10:56:18 -08:00
Brad Fitzpatrick
401d9a8de5
Merge "Don't let email addresses in database names get into the EventLog."
2010-02-22 09:10:19 -08:00
Steve Block
4da231aa52
Merge "In DumpRenderTree, skip tests for which we have the wrong results"
2010-02-22 08:18:20 -08:00
Daniel Sandler
26d4499358
Merge "Add new action for launching the user's music player app."
2010-02-22 06:32:25 -08:00
Mathias Agopian
98e71ddaed
remove a dependency of GraphicBuffer (libui) on Parcel (libbinder).
...
Add a Flattenable interface to libutils which can be used to flatten
an object into bytestream + filedescriptor stream.
Parcel is modified to handle Flattenable. And GraphicBuffer implements
Flattenable.
Except for the overlay classes libui is now independent of libbinder.
2010-02-21 23:27:25 -08:00
Wu-cheng Li
3111008ad5
Merge "Increase the sleep time to fix testTakePicture."
2010-02-21 23:18:45 -08:00