OSDN Git Service
Dianne Hackborn [Thu, 27 Aug 2009 19:26:44 +0000 (12:26 -0700)]
resolved conflicts for merge of
301b97ac to eclair
Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48
Android (Google) Code Review [Thu, 27 Aug 2009 17:58:25 +0000 (10:58 -0700)]
Merge change 22795 into eclair
* changes:
The Gservices settings for pruning messages/chats.
Android (Google) Code Review [Thu, 27 Aug 2009 17:43:18 +0000 (10:43 -0700)]
Merge change 22920 into eclair
* changes:
Change fade to use a gradient from opaque color to transparent color.
Android (Google) Code Review [Thu, 27 Aug 2009 17:10:07 +0000 (10:10 -0700)]
Merge change 22830 into eclair
* changes:
Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
Mike Lockwood [Thu, 27 Aug 2009 16:25:36 +0000 (09:25 -0700)]
am
7566c1de: LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '
7566c1debebe072af76411e11d96810fd1409482' into eclair
* commit '
7566c1debebe072af76411e11d96810fd1409482':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Android (Google) Code Review [Thu, 27 Aug 2009 14:43:36 +0000 (07:43 -0700)]
Merge change 22453 into eclair
* changes:
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
Android (Google) Code Review [Thu, 27 Aug 2009 08:14:00 +0000 (01:14 -0700)]
Merge change 22883 into donut
* changes:
Various tweaks to try to improve low memory behavior.
Android (Google) Code Review [Thu, 27 Aug 2009 03:29:17 +0000 (20:29 -0700)]
Merge change 21259 into eclair
* changes:
Make certificate-handling-related constants public
Android (Google) Code Review [Thu, 27 Aug 2009 00:59:26 +0000 (17:59 -0700)]
Merge change 22667 into eclair
* changes:
Fix rare NPE due to key being delivered after activity is stopped. #
2062930
Android (Google) Code Review [Thu, 27 Aug 2009 00:40:56 +0000 (17:40 -0700)]
Merge change 22841 into eclair
* changes:
dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked (in this case the state is dumped without the proper locks held which could result to a crash)
Android (Google) Code Review [Thu, 27 Aug 2009 00:18:47 +0000 (17:18 -0700)]
Merge change 22838 into eclair
* changes:
Implement clean killing of the TTS service. If files were being synthesized to while the service was being killed, it would have left partially written files (with no header). This CL checks if the service is rendering to a file at the time the service is destroyed: if it is, it will stop the rendering and deletes the file.
Android (Google) Code Review [Thu, 27 Aug 2009 00:11:23 +0000 (17:11 -0700)]
Merge change 22839 into eclair
* changes:
dumpstate: Get last_kmsg from /data instead of /proc.
Mathias Agopian [Wed, 26 Aug 2009 23:36:26 +0000 (16:36 -0700)]
dumpsys SurfaceFlinger will now always dump SF's state, even if SF is deadlocked
(in this case the state is dumped without the proper locks held which could result to a crash)
in addition, the last transaction and swap times are printed to the dump as well as the time spent
*currently* in these function. For instance, if SF is unresponsive because eglSwapBuffers() is stuck,
this will show up here.
Android (Google) Code Review [Wed, 26 Aug 2009 23:34:13 +0000 (16:34 -0700)]
Merge change 22826 into eclair
* changes:
Add Gservices setting for the frequency to perform provisioning.
Android (Google) Code Review [Wed, 26 Aug 2009 22:31:09 +0000 (15:31 -0700)]
Merge change 22822 into eclair
* changes:
resolved conflicts for merge of
b0f5b755 to eclair
Scott Main [Wed, 26 Aug 2009 22:18:14 +0000 (15:18 -0700)]
resolved conflicts for merge of
b0f5b755 to eclair
Android (Google) Code Review [Wed, 26 Aug 2009 22:18:21 +0000 (15:18 -0700)]
Merge change 22818 into eclair
* changes:
assert => CHECK in stagefright.
Android (Google) Code Review [Wed, 26 Aug 2009 21:13:55 +0000 (14:13 -0700)]
Merge change 22806 into eclair
* changes:
Add trailing "\n" to debug output.
Android (Google) Code Review [Wed, 26 Aug 2009 21:10:19 +0000 (14:10 -0700)]
Merge change 22772 into eclair
* changes:
New List and Tab assets.
Android (Google) Code Review [Wed, 26 Aug 2009 21:07:41 +0000 (14:07 -0700)]
Merge change 22803 into eclair
* changes:
Add uuids to adb shell dumpsys bluetooth
Android (Google) Code Review [Wed, 26 Aug 2009 21:03:15 +0000 (14:03 -0700)]
Merge change 22768 into eclair
* changes:
Fix authorization check for Audio Source.
Android (Google) Code Review [Wed, 26 Aug 2009 19:55:54 +0000 (12:55 -0700)]
Merge change 22090 into donut
* changes:
docs only. add new documentation for installing the new winusb driver. also add a link to the HTC support site for ADP flashing and remove references to the G1 and generalize to "consumer devices"
Android (Google) Code Review [Wed, 26 Aug 2009 19:25:55 +0000 (12:25 -0700)]
Merge change 22769 into eclair
* changes:
MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
Android (Google) Code Review [Wed, 26 Aug 2009 18:47:20 +0000 (11:47 -0700)]
Merge change 22732 into eclair
* changes:
clean up the too many deletes dialog
Bjorn Bringert [Wed, 26 Aug 2009 18:41:40 +0000 (11:41 -0700)]
am
ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit '
ba223760895e62ad2fcb85476984cb29018860c9' into eclair
* commit '
ba223760895e62ad2fcb85476984cb29018860c9':
Close suggestion cursors that arrive after adapter is closed
Android (Google) Code Review [Wed, 26 Aug 2009 17:38:53 +0000 (10:38 -0700)]
Merge change 22777 into eclair
* changes:
Disregard the EOS buffer flag while flushing or shutting down the decoder.
Android (Google) Code Review [Wed, 26 Aug 2009 17:30:56 +0000 (10:30 -0700)]
Merge change 22774 into eclair
* changes:
Added a commandline option to "stagefright" that limits decoding to a maximum number of frames per iteration.
Android (Google) Code Review [Wed, 26 Aug 2009 17:30:31 +0000 (10:30 -0700)]
Merge change 22773 into eclair
* changes:
Keep up with latest changes to overlay handling on that unnamable platform.
Android (Google) Code Review [Wed, 26 Aug 2009 17:20:30 +0000 (10:20 -0700)]
Merge change 22766 into eclair
* changes:
Add assets for fasttrack badges.
Android (Google) Code Review [Wed, 26 Aug 2009 05:08:38 +0000 (22:08 -0700)]
Merge change 22399 into eclair
* changes:
Refactor VCard handling code, phase 2, 3, 4, 5
Android (Google) Code Review [Wed, 26 Aug 2009 01:36:47 +0000 (18:36 -0700)]
Merge change 22710 into eclair
* changes:
Calculate specular lighting correctly
Android (Google) Code Review [Wed, 26 Aug 2009 01:36:22 +0000 (18:36 -0700)]
Merge change 22709 into eclair
* changes:
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
Martin Storsjo [Tue, 11 Aug 2009 16:01:14 +0000 (18:01 +0200)]
Calculate specular lighting correctly
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
Martin Storsjo [Mon, 10 Aug 2009 11:02:28 +0000 (13:02 +0200)]
If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
Android (Google) Code Review [Wed, 26 Aug 2009 01:33:13 +0000 (18:33 -0700)]
Merge change 22656 into eclair
* changes:
Adding an aggregation mode: AGGREGATION_SUSPENDED
Android (Google) Code Review [Wed, 26 Aug 2009 00:42:26 +0000 (17:42 -0700)]
Merge change 22702 into eclair
* changes:
run the sync thread at background priority
Android (Google) Code Review [Wed, 26 Aug 2009 00:24:58 +0000 (17:24 -0700)]
Merge change 22665 into eclair
* changes:
Decapitalize "Input method" in context menu.
Android (Google) Code Review [Wed, 26 Aug 2009 00:10:56 +0000 (17:10 -0700)]
Merge change 22695 into eclair
* changes:
Remove bogus comments and logging.
Android (Google) Code Review [Tue, 25 Aug 2009 23:18:32 +0000 (16:18 -0700)]
Merge change 22660 into eclair
* changes:
Simplify data icons of CDMA in status bar.
Android (Google) Code Review [Tue, 25 Aug 2009 23:11:47 +0000 (16:11 -0700)]
Merge change 22638 into eclair
* changes:
Fix the removal of dns entries.
Android (Google) Code Review [Tue, 25 Aug 2009 23:05:26 +0000 (16:05 -0700)]
Merge change 22674 into eclair
* changes:
GpsLocationProvider: Default to AGPS on if the setting is missing.
Android (Google) Code Review [Tue, 25 Aug 2009 23:00:54 +0000 (16:00 -0700)]
Merge change 22661 into eclair
* changes:
SettingsProvider: Fix botched merge from donut to eclair.
Android (Google) Code Review [Tue, 25 Aug 2009 21:55:27 +0000 (14:55 -0700)]
Merge change 22650 into eclair
* changes:
Fix build break - Introduced in 22109
Android (Google) Code Review [Tue, 25 Aug 2009 21:49:55 +0000 (14:49 -0700)]
Merge change 22651 into eclair
* changes:
Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
Android (Google) Code Review [Tue, 25 Aug 2009 21:35:12 +0000 (14:35 -0700)]
Merge change 22646 into eclair
* changes:
Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
Android (Google) Code Review [Tue, 25 Aug 2009 20:39:34 +0000 (13:39 -0700)]
Merge change 22566 into eclair
* changes:
Simplify CDMA Status Bar icons
Android (Google) Code Review [Tue, 25 Aug 2009 19:47:11 +0000 (12:47 -0700)]
Merge change 22109 into eclair
* changes:
Fix bug
1546445: Correct spelling errors in API - InstrumentationTestCase.injectInsrumentation - AndroidTestRunner.setInstrumentaiton
Android (Google) Code Review [Tue, 25 Aug 2009 19:41:37 +0000 (12:41 -0700)]
Merge change 22231 into eclair
* changes:
Add support for selecting the color bit depth and if the application used a depth buffer.
Android (Google) Code Review [Tue, 25 Aug 2009 19:35:55 +0000 (12:35 -0700)]
Merge change 22618 into eclair
* changes:
Only try to sync to subscribedfeeds for google acounts.
Android (Google) Code Review [Tue, 25 Aug 2009 19:07:53 +0000 (12:07 -0700)]
Merge change 22520 into eclair
* changes:
Add local frames for parsing properties and processing events.
Android (Google) Code Review [Tue, 25 Aug 2009 18:47:11 +0000 (11:47 -0700)]
Merge change 22549 into eclair
* changes:
- make it ok to modify the accounts before boot - allow packages in the system image to access any authtokens they wish
Yu Shan Emily Lau [Tue, 25 Aug 2009 17:42:02 +0000 (10:42 -0700)]
am
b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '
b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair
* commit '
b56de7474d93e634f77be58a794fbd1b0e68f6a8':
Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Android (Google) Code Review [Tue, 25 Aug 2009 17:23:29 +0000 (10:23 -0700)]
Merge change 22521 into eclair
* changes:
Revert volume if it wasn't okayed by user.
Android (Google) Code Review [Tue, 25 Aug 2009 06:56:49 +0000 (23:56 -0700)]
Merge change 22564 into eclair
* changes:
Add an extra intent parameter for recording duration limit.
Android (Google) Code Review [Tue, 25 Aug 2009 04:48:07 +0000 (21:48 -0700)]
Merge change 22563 into eclair
* changes:
fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
Mathias Agopian [Tue, 25 Aug 2009 04:47:13 +0000 (21:47 -0700)]
fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
Android (Google) Code Review [Tue, 25 Aug 2009 04:03:20 +0000 (21:03 -0700)]
Merge change 22559 into eclair
* changes:
Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
Android (Google) Code Review [Tue, 25 Aug 2009 03:20:51 +0000 (20:20 -0700)]
Merge change 22544 into eclair
* changes:
Fix bug that would leave old windows around.
Android (Google) Code Review [Tue, 25 Aug 2009 02:05:06 +0000 (19:05 -0700)]
Merge change 22545 into eclair
* changes:
Use correct UUID to authorize AVRCP
Android (Google) Code Review [Tue, 25 Aug 2009 01:27:55 +0000 (18:27 -0700)]
Merge change 22537 into eclair
* changes:
Fix build.
Android (Google) Code Review [Tue, 25 Aug 2009 01:26:52 +0000 (18:26 -0700)]
Merge change 22257 into eclair
* changes:
first step for fixing [
2066786] EGL object lifetime management doesn't respect the EGL spec
Android (Google) Code Review [Tue, 25 Aug 2009 01:20:41 +0000 (18:20 -0700)]
Merge change 22534 into eclair
* changes:
ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
Android (Google) Code Review [Tue, 25 Aug 2009 00:01:50 +0000 (17:01 -0700)]
Merge change 22400 into eclair
* changes:
Add more control over a service's start state.
Android (Google) Code Review [Mon, 24 Aug 2009 22:41:30 +0000 (15:41 -0700)]
Merge change 22493 into eclair
* changes:
Add resources to specify display rotation when in keyboard open or docked state.
Scott Main [Mon, 24 Aug 2009 22:35:28 +0000 (15:35 -0700)]
am
b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new samples
Merge commit '
b385508d89747e4c383979f1cc6fa2814b1cedbd' into eclair
* commit '
b385508d89747e4c383979f1cc6fa2814b1cedbd':
Add more code samples to the online docs.
Android (Google) Code Review [Mon, 24 Aug 2009 22:04:46 +0000 (15:04 -0700)]
Merge change 22496 into eclair
* changes:
fix typo
Android (Google) Code Review [Mon, 24 Aug 2009 21:13:05 +0000 (14:13 -0700)]
Merge change 21944 into eclair
* changes:
Implement new title bar hiding/showing behavior.
Android (Google) Code Review [Mon, 24 Aug 2009 20:59:29 +0000 (13:59 -0700)]
Merge change 22478 into eclair
* changes:
DockObserver: minor cleanup.
Android (Google) Code Review [Mon, 24 Aug 2009 20:45:30 +0000 (13:45 -0700)]
Merge change 22474 into eclair
* changes:
Compose Message "To" field allows adding sequence of characters as contact
Android (Google) Code Review [Mon, 24 Aug 2009 20:15:47 +0000 (13:15 -0700)]
Merge change 22470 into eclair
* changes:
Fix some Javadoc typos.
Android (Google) Code Review [Mon, 24 Aug 2009 20:14:25 +0000 (13:14 -0700)]
Merge change 22472 into eclair
* changes:
Remove Galaxy Render Script, replaced by its wallpaper equivalent.
Android (Google) Code Review [Mon, 24 Aug 2009 18:47:53 +0000 (11:47 -0700)]
Merge change 22452 into eclair
* changes:
don't center zoom on size change if zoom is in progress
Android (Google) Code Review [Mon, 24 Aug 2009 18:00:30 +0000 (11:00 -0700)]
Merge change 22449 into eclair
* changes:
Check for a null history item to avoid crashing.
Android (Google) Code Review [Mon, 24 Aug 2009 17:56:10 +0000 (10:56 -0700)]
Merge change 22440 into eclair
* changes:
Java-side changes to persist Geolocation permissions between browser sessions.
Android (Google) Code Review [Mon, 24 Aug 2009 17:34:32 +0000 (10:34 -0700)]
Merge change 22430 into eclair
* changes:
Remove frameworks/base/im since these stuff are only used by IM app
Yu Shan Emily Lau [Mon, 24 Aug 2009 17:14:25 +0000 (10:14 -0700)]
am
8c937a17: Merge change 22379 into donut
Merge commit '
8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair
* commit '
8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Android (Google) Code Review [Mon, 24 Aug 2009 17:11:00 +0000 (10:11 -0700)]
Merge change 22379 into donut
* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
Android (Google) Code Review [Mon, 24 Aug 2009 15:45:06 +0000 (08:45 -0700)]
Merge change 22377 into eclair
* changes:
The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network result.
Android (Google) Code Review [Mon, 24 Aug 2009 10:07:15 +0000 (03:07 -0700)]
Merge change 22262 into eclair
* changes:
Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
Android (Google) Code Review [Mon, 24 Aug 2009 09:28:23 +0000 (02:28 -0700)]
Merge change 21978 into eclair
* changes:
Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
Scott Su [Mon, 24 Aug 2009 02:24:57 +0000 (10:24 +0800)]
Remove frameworks/base/im since these stuff are only used by IM app
Android (Google) Code Review [Sun, 23 Aug 2009 05:57:30 +0000 (22:57 -0700)]
Merge change 22160 into eclair
* changes:
Add dither XML flag to StateListDrawable.
Android (Google) Code Review [Sat, 22 Aug 2009 18:07:20 +0000 (11:07 -0700)]
Merge change 22383 into eclair
* changes:
Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
Eric Fischer [Sat, 22 Aug 2009 14:43:44 +0000 (07:43 -0700)]
am
36d5aaec: Merge change 22322 into donut
Merge commit '
36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair
* commit '
36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Mathias Agopian [Fri, 21 Aug 2009 09:18:25 +0000 (02:18 -0700)]
first step for fixing [
2066786] EGL object lifetime management doesn't respect the EGL spec
this change fixes the lifetime mgt of EGLSurface, EGLContext and EGLImageKHR in the EGL wrapper.
EGLDisplay is still somewhat bogus and libagl's EGL is still incorrect.
The idea of the change is that EGL objects are put in a list when created and removed when destroyed.
Before each use, we first verify if the object is in the list and if so a reference is taken and kept
for the scope of the whole EGL API being called, if not, an error is returned.
Upon object destruction, the object is simply marked as "terminated" (this is not protected by a lock
because it doesn't really matter). This flag is only used to deny access to the object by other APIs
while it's still valid (for instance current or being used by another function in another thread).
A reference is also removed and the object can then actually be destroyed when going out of scope.
Android (Google) Code Review [Sat, 22 Aug 2009 00:05:24 +0000 (17:05 -0700)]
Merge change 22362 into eclair
* changes:
Fix +NANP issue and cleanup plus code conversion.
Android (Google) Code Review [Fri, 21 Aug 2009 23:30:13 +0000 (16:30 -0700)]
Merge change 22352 into eclair
* changes:
Fix FallRS by keeping a reference to the mesh.
Android (Google) Code Review [Fri, 21 Aug 2009 22:58:43 +0000 (15:58 -0700)]
Merge change 22328 into eclair
* changes:
Fix recurrence parsing for all-day events.
Android (Google) Code Review [Fri, 21 Aug 2009 22:45:22 +0000 (15:45 -0700)]
Merge change 22344 into eclair
* changes:
fix [
2070341] [FAST BLOCKER] can't successfully setup erc52
Mathias Agopian [Fri, 21 Aug 2009 22:44:17 +0000 (15:44 -0700)]
fix [
2070341] [FAST BLOCKER] can't successfully setup erc52
Android (Google) Code Review [Fri, 21 Aug 2009 22:20:31 +0000 (15:20 -0700)]
Merge change 22331 into eclair
* changes:
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
Android (Google) Code Review [Fri, 21 Aug 2009 21:47:41 +0000 (14:47 -0700)]
Merge change 22322 into donut
* changes:
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Android (Google) Code Review [Fri, 21 Aug 2009 21:10:12 +0000 (14:10 -0700)]
Merge change 22314 into eclair
* changes:
Purge cache
Android (Google) Code Review [Fri, 21 Aug 2009 20:45:22 +0000 (13:45 -0700)]
Merge change 22316 into eclair
* changes:
Cleaning up Presence API
Android (Google) Code Review [Fri, 21 Aug 2009 20:43:01 +0000 (13:43 -0700)]
Merge change 22318 into eclair
* changes:
Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA: High-Speed Packet Access
Android (Google) Code Review [Fri, 21 Aug 2009 20:40:40 +0000 (13:40 -0700)]
Merge change 22292 into eclair
* changes:
Adding a "Photo" directory under Contacts.
Android (Google) Code Review [Fri, 21 Aug 2009 20:36:30 +0000 (13:36 -0700)]
Merge change 22290 into eclair
* changes:
Fix typo: the x offset was assigned to the y coordinate.
Android (Google) Code Review [Fri, 21 Aug 2009 20:26:19 +0000 (13:26 -0700)]
Merge change 22308 into eclair
* changes:
Replace fullHeight support by fullSize (height and width)
Jean-Baptiste Queru [Fri, 21 Aug 2009 19:59:04 +0000 (12:59 -0700)]
resolved conflicts for merge of
081a136d to eclair
Android (Google) Code Review [Fri, 21 Aug 2009 18:54:15 +0000 (11:54 -0700)]
Merge change 22302 into eclair
* changes:
Set BondState to Canceled when user cancels pairing.