Kenny Root
0fd740ea98
Merge "Revert "Dedupe resource config pointers""
2010-03-10 11:39:12 -08:00
Andreas Huber
ccaa73b458
Merge "Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files."
2010-03-10 11:12:56 -08:00
Marco Nelissen
06790f902d
Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/2502881)"
2010-03-10 10:58:23 -08:00
Adam Powell
406a9e294d
Merge "Added ViewConfiguration.getScaledPagingTouchSlop()"
2010-03-10 10:50:38 -08:00
Leon Scroggins
7d39d2d351
Merge "When context is voice, show the microphone."
2010-03-10 10:07:46 -08:00
Chia-chi Yeh
00397e02c8
Merge "YuvImage: jpeg_set_quality() should be called after jpeg_set_defaults()."
2010-03-10 06:36:06 -08:00
Brad Fitzpatrick
4f2cb219ed
Merge "SettingsProvider: dup-suppress from cache."
2010-03-09 22:48:40 -08:00
Jean-Baptiste Queru
14c68948a0
Merge "Use proper config to enable LVMX."
2010-03-09 18:44:06 -08:00
Jean-Baptiste Queru
c3897a2aea
Merge "Use proper config to enable LVMX"
2010-03-09 18:43:57 -08:00
Jean-Baptiste Queru
e4623e8754
Use proper config to enable LVMX
...
Change-Id: Ifa75a82884b99aeee139e055f40e7c510cf28213
2010-03-09 18:13:59 -08:00
Brad Fitzpatrick
b8d57d8483
Merge "SettingsProvider: defensively cap size of settings kept cached in memory."
2010-03-09 17:24:51 -08:00
Dianne Hackborn
82fecb01df
Add ability for some manifest attributes to reference resources.
...
This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).
Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
2010-03-09 17:18:05 -08:00
Jaikumar Ganesh
080b8a84d9
Merge "Add an API to set the link timeout."
2010-03-09 16:56:36 -08:00
Brad Fitzpatrick
6a595bd8c3
Merge "Speed up ContentProvider.query() in simple case by ~30%"
2010-03-09 16:42:44 -08:00
Romain Guy
28799e0911
Merge "Support unbundled bookmarks. Bug #2460685 "
2010-03-09 16:39:13 -08:00
Ray Chen
0501bf1cb9
Merge "Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will calculate it if needed."
2010-03-09 16:20:59 -08:00
Glenn Kasten
53a51da692
Merge "Initial version of LifeVibes integration. Also changed tabs to spaces in other audioflinger files."
2010-03-09 16:00:17 -08:00
Robert Greenwalt
4809e4ace2
Merge "Fix NO_CONNECTIVITY flag in some cases."
2010-03-09 15:42:34 -08:00
Adam Powell
34225d2ef5
Merge "Fix ListView filter popups when window focus changes"
2010-03-09 15:38:56 -08:00
Mike Lockwood
4911673b76
Merge "Don't let hidden keyguard interfere with button and screen brightness overrides"
2010-03-09 14:57:42 -08:00
Mike Lockwood
c2325b3ec9
Merge "Add new shutdown observer for MountService. Use new observer before rebooting and shutting down. Add some unit tests for unmount and shutdown code paths Fix registering/unregistering part in MountService Use ShutdownThread in PowerManager.reboot() Add reboot support to ShutdownThread. Remove MountService code from PowerManagerService.java and Power.java. Clean shutdown/reboot is handled exclusively by ShutdownThread now."
2010-03-09 14:50:18 -08:00
Grace Kloba
af630557ae
Merge "Add an api to set WebView over scroll background."
2010-03-09 14:20:34 -08:00
Adam Powell
c4c96d08ec
Merge "Fix bug with AbsListView position scrolling"
2010-03-09 14:19:47 -08:00
Glenn Kasten
d5ea969b41
Initial version of LifeVibes integration.
...
Also changed tabs to spaces in other audioflinger files.
2010-03-09 14:16:01 -08:00
Vasu Nori
71b2c240fd
Merge "add REPLACE to the list of cached sql stmnts"
2010-03-09 13:42:20 -08:00
Jean-Michel Trivi
fde17eca4c
Merge "Fix bug 2329540 Part 1 of the fix: when the user doesn't elect to use the car dock for music and media, the APM was not aware of the device being docked. This is fixed by dissociating the notification for the APM of the docking to the dock from the sink state change of the A2DP device. Also missing was forcing the volumes to be reevaluated whenever the device is docked or undocked, as volumes for docks may differ, even when the same output device is being used."
2010-03-09 13:17:35 -08:00
Jean-Michel Trivi
84cf7d9e88
Fix bug 2329540
...
Part 1 of the fix: when the user doesn't elect to use the car dock
for music and media, the APM was not aware of the device being
docked.
This is fixed by dissociating the notification for the APM of
the docking to the dock from the sink state change of the A2DP
device.
Also missing was forcing the volumes to be reevaluated whenever
the device is docked or undocked, as volumes for docks may
differ, even when the same output device is being used.
Change-Id: If5314e27821a71adbd6df6fdf887c45208241d96
2010-03-09 12:45:55 -08:00
Robert Greenwalt
5fcf8d67ad
Merge "Re-add tethered notification to framework."
2010-03-09 11:55:53 -08:00
Adam Powell
4a05be2fe2
Merge "Restore old/buggy behavior of ListView.getCheckItemIds() for adapters without stable IDs to support legacy code."
2010-03-09 11:55:05 -08:00
Vasu Nori
12e22c5ce6
Merge "modify comments to be more accurate"
2010-03-09 11:46:57 -08:00
Andreas Huber
c629b50906
Merge "Fix a typo in VideoView.java that disabled the seek-back button by default."
2010-03-09 11:43:31 -08:00
Mike LeBeau
2febfb8aed
Merge "Add new LoggingEvents for more detailed text modification actions for voice input."
2010-03-09 10:43:47 -08:00
Mike LeBeau
bf94f65075
Add new LoggingEvents for more detailed text modification actions for voice input.
...
Change-Id: I70df3612067f1c8c512a7bbe6c02381724f76bbf
2010-03-09 10:42:35 -08:00
Jean-Michel Trivi
49ac0e5e5e
Merge "Fix bug 2481825 When TTS is synthesizing to a file, return an error if the file cannot be created."
2010-03-09 10:31:30 -08:00
Andrei Popescu
d816fa7664
Merge "Make sure access to WebView::mWebViewCore is synchronized."
2010-03-09 10:06:23 -08:00
Ficus Kirkpatrick
8647c8cd81
Merge "Add a LOG_TAG for android.graphics.Graphics JNI."
2010-03-09 10:01:00 -08:00
Suchi Amalapurapu
e82d377a0e
Merge "Add conditions to check for updated system applications. Restrict them to internal flash only even before we copy."
2010-03-09 09:58:40 -08:00
Jean-Michel Trivi
b51357d774
Merge "Unhide API additions to AudioManager for AudioFocus support."
2010-03-09 09:17:45 -08:00
Andreas Huber
170bfea8c8
Merge "Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests."
2010-03-09 09:09:27 -08:00
Steve Block
0346f1a357
Merge "Removes from DumpRenderTree the superfluous result file for tests that time out."
2010-03-09 07:02:18 -08:00
Steve Block
88995ed150
Merge "Removes regex tests from the DumpRenderTree skipped list"
2010-03-09 05:42:09 -08:00
Steve Block
823cd9f077
Merge "Add shared workers tests to DumpRenderTree skipped list"
2010-03-09 04:25:13 -08:00
Brad Fitzpatrick
a1b9419ff1
Merge "Fix Parcel leak in ContentProvider.call()"
2010-03-08 22:18:52 -08:00
Mathias Agopian
948d69fca4
improve SF logging/debugging a little bit
...
Change-Id: I6a57f89c25defc293fd748cc1fbd710031c02ec2
2010-03-08 19:30:56 -08:00
Mathias Agopian
7d3f8ed3a5
Merge "Fix a small bug where we could compute SharedBufferStack's tail incorrectly."
2010-03-08 19:24:27 -08:00
Mathias Agopian
c2e30de00c
Fix a small bug where we could compute SharedBufferStack's tail incorrectly.
...
Also add "tail" to the debug dump().
Change-Id: I04b1ea375dfc9ddcc22f0c6b6cd01300e507572e
2010-03-08 19:23:26 -08:00
Dan Egnor
3d85d27a38
Merge "More consistent and clear traces.txt reporting."
2010-03-08 19:23:01 -08:00
Adam Powell
40cd490bb1
Merge "Fix issues with ListView.smoothScrollBy"
2010-03-08 19:11:16 -08:00
Dmitri Plotnikov
0733757885
Merge "Showing phonetic name in the contact header."
2010-03-08 18:04:24 -08:00
Chia-chi Yeh
5bf4691382
Merge "keystore: add AID_ROOT into the user table."
2010-03-08 17:50:56 -08:00