OSDN Git Service

android-x86/frameworks-base.git
13 years agoUpdate Chromium HTTP stack to get database and cache paths from CookieSyncManager
Steve Block [Wed, 27 Oct 2010 10:29:42 +0000 (11:29 +0100)]
Update Chromium HTTP stack to get database and cache paths from CookieSyncManager

Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.

This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.

Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.

Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76579

Change-Id: I8e910ee209c570e90181bd308a78d1987b4d120c

13 years agoStrip off MIME types when loading content URLs.
Iain Merrick [Wed, 27 Oct 2010 11:33:09 +0000 (12:33 +0100)]
Strip off MIME types when loading content URLs.

Matching behaviour that has been in ContentLoader.java since
approximately day 0. Without this, we can't load Gmail attachments
with the Chrome HTTP stack because of permission errors -- we have
to load exactly the URL Gmail tells us.

See http://b/issue?id=3125650

Change-Id: I764036efd428299b2fcd611b62dc046a40d80a55

13 years agoMerge "Only AV formats should be handled by MediaPlayer (Java side)"
Iain Merrick [Wed, 27 Oct 2010 10:31:01 +0000 (03:31 -0700)]
Merge "Only AV formats should be handled by MediaPlayer (Java side)"

13 years agoOnly AV formats should be handled by MediaPlayer (Java side)
Iain Merrick [Wed, 27 Oct 2010 09:15:14 +0000 (10:15 +0100)]
Only AV formats should be handled by MediaPlayer (Java side)

Must be submitted with corresponding C++ change (I50da7599).

When opening a text file in the browser, WebKit was attempting to
display it as a movie. This is because the media player now reports
that it can handle various document formats, including plain text.

See http://b/issue?id=3132917

This CL updates WebViewCore.supportsMimeType() to explicitly check
for audio and video formats only. This is called from WebKit via
JNI, and doesn't seem to be used elsewhere, so it should be a safe
change to make. Renamed to isSupportedMediaMimeType() for clarity.

Test: push a text file to /sdcard/foo.txt, and open it in the
browser (as file:///sdcard/foo.txt).

Change-Id: Id39b770b05ced7c976d8043649845f26115b24c9

13 years agoRemove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_A...
satok [Wed, 27 Oct 2010 05:11:03 +0000 (14:11 +0900)]
Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER

Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f

13 years agoMerge "Removed the start and end transition types."
Gil Dobjanschi [Wed, 27 Oct 2010 01:57:57 +0000 (18:57 -0700)]
Merge "Removed the start and end transition types."

13 years agoMerge "convert one of the LOGE to LOG_WINDOW msg to reduce grief"
Vasu Nori [Wed, 27 Oct 2010 01:39:27 +0000 (18:39 -0700)]
Merge "convert one of the LOGE to LOG_WINDOW msg to reduce grief"

13 years agoMerge "OpenGL tracing."
Jack Palevich [Wed, 27 Oct 2010 01:37:10 +0000 (18:37 -0700)]
Merge "OpenGL tracing."

13 years agoMerge "Allow a GLSurfaceView to be reattached to a window."
Jack Palevich [Wed, 27 Oct 2010 01:25:56 +0000 (18:25 -0700)]
Merge "Allow a GLSurfaceView to be reattached to a window."

13 years agoAllow a GLSurfaceView to be reattached to a window.
Jack Palevich [Wed, 27 Oct 2010 01:19:14 +0000 (18:19 -0700)]
Allow a GLSurfaceView to be reattached to a window.

This approach is more backwards-compatible than the previous attempt.

The onDetachedFromWindow case is unchanged from the "classic"
GLSurfaceView behavior, except that we don't throw a NPE if the
renderer has never been set.

Change-Id: Ia8103a73366ddb13be44f16b789c929e75ddc792

13 years agoMerge "add method in MediaFile to determine if a file is a mediatype of not"
Vasu Nori [Wed, 27 Oct 2010 00:59:03 +0000 (17:59 -0700)]
Merge "add method in MediaFile to determine if a file is a mediatype of not"

13 years agoMerge "Fix rendering of digitalClock/Gallery in Eclipse editors."
Xavier Ducrohet [Tue, 26 Oct 2010 23:56:30 +0000 (16:56 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors."

13 years agoconvert one of the LOGE to LOG_WINDOW msg to reduce grief
Vasu Nori [Tue, 26 Oct 2010 23:44:44 +0000 (16:44 -0700)]
convert one of the LOGE to LOG_WINDOW msg to reduce grief

grief from people who think this message is bad news.
but in reality, this message is really just an informational message
to aid in debugging

Change-Id: I1a2ab1666a27adb7d3fd210528b2c5218640d53d

13 years agoMerge "Remove unnecessary GL calls."
Romain Guy [Tue, 26 Oct 2010 23:31:31 +0000 (16:31 -0700)]
Merge "Remove unnecessary GL calls."

13 years agoRemove unnecessary GL calls.
Romain Guy [Tue, 26 Oct 2010 23:27:31 +0000 (16:27 -0700)]
Remove unnecessary GL calls.

This change batches calls to glScissor() and removes extra GL
queries and glActiveTexture() calls.

Change-Id: I1cd079d314f87cd9c088f95c8d4909c2f860f6aa

13 years agoam e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data...
Andreas Huber [Tue, 26 Oct 2010 23:25:51 +0000 (16:25 -0700)]
am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread

13 years agoam 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless...
Andreas Huber [Tue, 26 Oct 2010 23:23:54 +0000 (16:23 -0700)]
am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread

13 years agoMerge "Assume that all of the decoded vorbis audio data is valid unless the source...
Andreas Huber [Tue, 26 Oct 2010 23:21:47 +0000 (16:21 -0700)]
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread

13 years agoMerge "Begin adding async allocation creation."
Jason Sams [Tue, 26 Oct 2010 23:16:17 +0000 (16:16 -0700)]
Merge "Begin adding async allocation creation."

13 years agoadd method in MediaFile to determine if a file is a mediatype of not
Vasu Nori [Tue, 26 Oct 2010 23:12:27 +0000 (16:12 -0700)]
add method in MediaFile to determine if a file is a mediatype of not

this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.

Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd

13 years agoam 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were...
Justin Ho [Tue, 26 Oct 2010 23:10:57 +0000 (16:10 -0700)]
am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

13 years agoMerge "WifiLock extensions for high performance mode"
Irfan Sheriff [Tue, 26 Oct 2010 23:08:29 +0000 (16:08 -0700)]
Merge "WifiLock extensions for high performance mode"

13 years agoam 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications...
Justin Ho [Tue, 26 Oct 2010 23:08:13 +0000 (16:08 -0700)]
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

13 years agoMerge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into ginger...
Justin Ho [Tue, 26 Oct 2010 23:06:28 +0000 (16:06 -0700)]
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

13 years agoMerge "- Made showNext() and showPrevious() on StackView remotable - Made StackView...
Adam Cohen [Tue, 26 Oct 2010 22:51:57 +0000 (15:51 -0700)]
Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or   showPrevious() is called"

13 years ago- Made showNext() and showPrevious() on StackView remotable
Adam Cohen [Tue, 26 Oct 2010 20:54:00 +0000 (13:54 -0700)]
- Made showNext() and showPrevious() on StackView remotable
- Made StackView show the transition when showNext() or
  showPrevious() is called

Change-Id: Id6e3e6d9ff374c037323f77d247f1a1e4398009e

13 years agoDO NOT MERGE - Fixing ringtones that were put in as notifications
Justin Ho [Tue, 26 Oct 2010 22:34:07 +0000 (15:34 -0700)]
DO NOT MERGE - Fixing ringtones that were put in as notifications

Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677

13 years agoMerge "ClipDescription no longer inherits from ClipData."
Dianne Hackborn [Tue, 26 Oct 2010 22:25:18 +0000 (15:25 -0700)]
Merge "ClipDescription no longer inherits from ClipData."

13 years agoClipDescription no longer inherits from ClipData.
Dianne Hackborn [Tue, 26 Oct 2010 19:43:57 +0000 (12:43 -0700)]
ClipDescription no longer inherits from ClipData.

Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29

13 years agoOpenGL tracing.
Jack Palevich [Tue, 26 Oct 2010 22:21:24 +0000 (15:21 -0700)]
OpenGL tracing.

Enable with:

adb shell setprop debug.egl.trace 1

Change-Id: Icfbc795f5260141510975228e72234e9aab56a85

13 years agoAssume that all of the decoded vorbis audio data is valid unless the source indicates...
Andreas Huber [Tue, 26 Oct 2010 22:01:03 +0000 (15:01 -0700)]
Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.

Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490

13 years agoFix rendering of digitalClock/Gallery in Eclipse editors.
Xavier Ducrohet [Tue, 26 Oct 2010 21:01:41 +0000 (14:01 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.

Change-Id: Iedcd3184cd9f34be8d0695a51eda953ac68683ce

13 years agoMerge "Enable display lists."
Romain Guy [Tue, 26 Oct 2010 21:26:15 +0000 (14:26 -0700)]
Merge "Enable display lists."

13 years agoEnable display lists.
Romain Guy [Tue, 26 Oct 2010 21:22:30 +0000 (14:22 -0700)]
Enable display lists.

Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316

13 years agoMerge "Do not create drm directory here. Fix for bug 3134576."
Gloria Wang [Tue, 26 Oct 2010 21:16:47 +0000 (14:16 -0700)]
Merge "Do not create drm directory here. Fix for bug 3134576."

13 years agoRevert "Fix rendering of digitalClock/Gallery in Eclipse editors."
Raphael [Tue, 26 Oct 2010 20:55:10 +0000 (13:55 -0700)]
Revert "Fix rendering of digitalClock/Gallery in Eclipse editors."

This reverts commit 25e96ce7b99f9736a6024d25bd65a83774c7640f.

13 years agoWifiLock extensions for high performance mode
Irfan Sheriff [Fri, 13 Aug 2010 03:26:23 +0000 (20:26 -0700)]
WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd

13 years agoBegin adding async allocation creation.
Jason Sams [Tue, 26 Oct 2010 20:09:17 +0000 (13:09 -0700)]
Begin adding async allocation creation.

Change-Id: I5d1381699e2b334c1d824f357bd6b310a5f79be8

Implement async bitmap upload and clean up types.

Change-Id: Icbe9894e04c1319351c1cd75b0e0017855198f20

13 years agoMerge "Optimizing ColorFilter in display lists"
Chet Haase [Tue, 26 Oct 2010 19:53:57 +0000 (12:53 -0700)]
Merge "Optimizing ColorFilter in display lists"

13 years agoOptimizing ColorFilter in display lists
Chet Haase [Fri, 22 Oct 2010 23:17:12 +0000 (16:17 -0700)]
Optimizing ColorFilter in display lists

Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54

13 years agoMerge "Remove logspew."
Daniel Sandler [Tue, 26 Oct 2010 19:48:35 +0000 (12:48 -0700)]
Merge "Remove logspew."

13 years agoRemove logspew.
Daniel Sandler [Tue, 26 Oct 2010 19:37:36 +0000 (15:37 -0400)]
Remove logspew.

Change-Id: Ic713febfb1d92d19321ed512dbf6f38e5e2dfbf4

13 years agoam 85c5ca07: am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its...
Mathias Agopian [Tue, 26 Oct 2010 19:26:23 +0000 (12:26 -0700)]
am 85c5ca07: am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

13 years agoam 1b98a9e6: am 5219dd8e: Merge "add format parameter to setBufferGeometry" into...
Mathias Agopian [Tue, 26 Oct 2010 19:23:53 +0000 (12:23 -0700)]
am 1b98a9e6: am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread

13 years agoam d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into...
Mathias Agopian [Tue, 26 Oct 2010 19:23:46 +0000 (12:23 -0700)]
am d9588e9c: am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread

13 years agoam 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format...
Mathias Agopian [Tue, 26 Oct 2010 19:22:12 +0000 (12:22 -0700)]
am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

13 years agoam 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:48 +0000 (12:19 -0700)]
am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread

13 years agoam a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:43 +0000 (12:19 -0700)]
am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread

13 years agoMerge "Updade Surface (ANativeWindow) format based on its buffers format" into ginger...
Mathias Agopian [Tue, 26 Oct 2010 19:18:32 +0000 (12:18 -0700)]
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

13 years agoMerge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:19 +0000 (12:18 -0700)]
Merge "add format parameter to setBufferGeometry" into gingerbread

13 years agoam f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into...
Jeff Hamilton [Tue, 26 Oct 2010 19:18:08 +0000 (12:18 -0700)]
am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread

13 years agoMerge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread

13 years agoam d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:16:10 +0000 (12:16 -0700)]
am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread

13 years agoMerge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread

13 years agoam a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse...
Xavier Ducrohet [Tue, 26 Oct 2010 19:13:32 +0000 (12:13 -0700)]
am a44a5e02: am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread

13 years agoDo not create drm directory here. Fix for bug 3134576.
Gloria Wang [Tue, 26 Oct 2010 19:11:55 +0000 (12:11 -0700)]
Do not create drm directory here. Fix for bug 3134576.

Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294

13 years agoam 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into...
Xavier Ducrohet [Tue, 26 Oct 2010 19:10:28 +0000 (12:10 -0700)]
am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread

13 years agoAdd a way to get a string for an error code.
Jeff Hamilton [Tue, 26 Oct 2010 19:09:48 +0000 (14:09 -0500)]
Add a way to get a string for an error code.

Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d

13 years agoMerge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:09:18 +0000 (12:09 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread

13 years agoMerge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"
James Dong [Tue, 26 Oct 2010 19:01:39 +0000 (12:01 -0700)]
Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java"

13 years agoRemoved the start and end transition types.
Gil Dobjanschi [Tue, 26 Oct 2010 18:53:24 +0000 (11:53 -0700)]
Removed the start and end transition types.

Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4

13 years agoMerge "Effects and overlays are not modified when a video clip is trimmed."
Gil Dobjanschi [Tue, 26 Oct 2010 18:50:04 +0000 (11:50 -0700)]
Merge "Effects and overlays are not modified when a video clip is trimmed."

13 years agoMerge "Fix A2DP connection problem, if disconnected while playing music."
Jaikumar Ganesh [Tue, 26 Oct 2010 18:31:44 +0000 (11:31 -0700)]
Merge "Fix A2DP connection problem, if disconnected while playing music."

13 years agoRemove unused and hidden setVideoEncoderLevel() from MediaRecorder.java
James Dong [Tue, 26 Oct 2010 17:56:34 +0000 (10:56 -0700)]
Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java

Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa

13 years agoMerge "Fix debug statements and aapt assert."
Patrick Scott [Tue, 26 Oct 2010 18:26:19 +0000 (11:26 -0700)]
Merge "Fix debug statements and aapt assert."

13 years agoFix A2DP connection problem, if disconnected while playing music.
Jaikumar Ganesh [Tue, 26 Oct 2010 18:22:48 +0000 (11:22 -0700)]
Fix A2DP connection problem, if disconnected while playing music.

Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69

13 years agoMerge "Fix issue #3130426: Finsky crash in switching from window carousel"
Dianne Hackborn [Tue, 26 Oct 2010 18:20:06 +0000 (11:20 -0700)]
Merge "Fix issue #3130426: Finsky crash in switching from window carousel"

13 years agoMerge "New Holo style for Tabs."
Gilles Debunne [Tue, 26 Oct 2010 18:18:51 +0000 (11:18 -0700)]
Merge "New Holo style for Tabs."

13 years agoFix rendering of digitalClock/Gallery in Eclipse editors.
Xavier Ducrohet [Tue, 26 Oct 2010 18:18:39 +0000 (11:18 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.

Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216

13 years agoFix issue #3130426: Finsky crash in switching from window carousel
Dianne Hackborn [Tue, 26 Oct 2010 00:08:56 +0000 (17:08 -0700)]
Fix issue #3130426: Finsky crash in switching from window carousel

Need to note that we no longer have saved state before delivering
results or new intents to an activity.

Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data.  This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).

Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747

13 years agoNew Holo style for Tabs.
Gilles Debunne [Tue, 19 Oct 2010 18:56:59 +0000 (11:56 -0700)]
New Holo style for Tabs.

Holo theme with new assets and style for TabWidgets.

Legacy Themes still use GB style.

Assets added in a previous bluk update were removed.

Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1

13 years agoadd wps pin from device capability
Irfan Sheriff [Thu, 21 Oct 2010 23:44:48 +0000 (16:44 -0700)]
add wps pin from device capability

Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542

13 years agoFix debug statements and aapt assert.
Patrick Scott [Thu, 21 Oct 2010 18:53:40 +0000 (14:53 -0400)]
Fix debug statements and aapt assert.

ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543

13 years agoMerge "Fix the viewport height to view height when title bar is visible."
Shimeng (Simon) Wang [Tue, 26 Oct 2010 17:05:20 +0000 (10:05 -0700)]
Merge "Fix the viewport height to view height when title bar is visible."

13 years agoMerge "Add two creation flags to OMXCodec::Create()"
James Dong [Tue, 26 Oct 2010 16:26:24 +0000 (09:26 -0700)]
Merge "Add two creation flags to OMXCodec::Create()"

13 years agoam cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone...
Justin Ho [Tue, 26 Oct 2010 16:13:08 +0000 (09:13 -0700)]
am cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread

13 years agoam 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into...
Justin Ho [Tue, 26 Oct 2010 16:11:12 +0000 (09:11 -0700)]
am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread

13 years agoMerge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:09:22 +0000 (09:09 -0700)]
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread

13 years agoDO NOT MERGE - Fixing capitalized ringtone metadata only
Justin Ho [Tue, 26 Oct 2010 16:05:06 +0000 (09:05 -0700)]
DO NOT MERGE - Fixing capitalized ringtone metadata only

Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e

13 years agoam 1b571bd3: am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvide...
Mike Lockwood [Tue, 26 Oct 2010 15:38:51 +0000 (08:38 -0700)]
am 1b571bd3: am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

13 years agoam 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering...
Mike Lockwood [Tue, 26 Oct 2010 15:36:24 +0000 (08:36 -0700)]
am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

13 years agoMerge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 15:34:32 +0000 (08:34 -0700)]
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread

13 years agoam ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:17:07 +0000 (08:17 -0700)]
am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread

13 years agoam 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:14:48 +0000 (08:14 -0700)]
am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread

13 years agoMerge "Partial fix for issue 3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue 3124895." into gingerbread

13 years agoMerge "Update WebView useragent string for merge to WebKit r70209"
Ben Murdoch [Tue, 26 Oct 2010 14:44:34 +0000 (07:44 -0700)]
Merge "Update WebView useragent string for merge to WebKit r70209"

13 years agoEffects and overlays are not modified when a video clip is trimmed.
Gil Dobjanschi [Tue, 26 Oct 2010 14:44:00 +0000 (07:44 -0700)]
Effects and overlays are not modified when a video clip is trimmed.

Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53

13 years agoam 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into ginge...
Jeff Hamilton [Tue, 26 Oct 2010 14:28:57 +0000 (07:28 -0700)]
am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread

13 years agoam a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen...
Joe Onorato [Tue, 26 Oct 2010 14:28:51 +0000 (07:28 -0700)]
am a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread

13 years agoam 79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:24:57 +0000 (07:24 -0700)]
am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread

13 years agoam 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part...
Joe Onorato [Tue, 26 Oct 2010 14:24:41 +0000 (07:24 -0700)]
am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread

13 years agoUpdate WebView useragent string for merge to WebKit r70209
Ben Murdoch [Fri, 22 Oct 2010 12:02:35 +0000 (13:02 +0100)]
Update WebView useragent string for merge to WebKit r70209

Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68

13 years agoMerge "Make some contructors public but hidden." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread

13 years agoLocation Manager: Fix LocationManager.getBestProvider filtering.
Mike Lockwood [Tue, 26 Oct 2010 14:01:55 +0000 (10:01 -0400)]
Location Manager: Fix LocationManager.getBestProvider filtering.

getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
13 years agoMerge "DisplayList optimizations and fixes."
Chet Haase [Tue, 26 Oct 2010 13:59:19 +0000 (06:59 -0700)]
Merge "DisplayList optimizations and fixes."

13 years agoMake some contructors public but hidden.
Jeff Hamilton [Tue, 26 Oct 2010 13:59:18 +0000 (08:59 -0500)]
Make some contructors public but hidden.

This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064

13 years agoDisplayList optimizations and fixes.
Chet Haase [Mon, 25 Oct 2010 22:47:32 +0000 (15:47 -0700)]
DisplayList optimizations and fixes.

We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027

13 years agoA temporary fix for "Waiting for service drm.drmManager".
Gloria Wang [Tue, 26 Oct 2010 10:31:13 +0000 (03:31 -0700)]
A temporary fix for "Waiting for service drm.drmManager".

Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9

13 years agoMerge "Add logs to debug incoming A2DP connection issue."
Jaikumar Ganesh [Tue, 26 Oct 2010 07:32:06 +0000 (00:32 -0700)]
Merge "Add logs to debug incoming A2DP connection issue."

13 years agoAdd logs to debug incoming A2DP connection issue.
Jaikumar Ganesh [Tue, 26 Oct 2010 07:28:39 +0000 (00:28 -0700)]
Add logs to debug incoming A2DP connection issue.

Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2