OSDN Git Service
Jean-Baptiste Queru [Wed, 9 Jun 2010 17:51:16 +0000 (10:51 -0700)]
Merge "Adding mimetypes to the mimetype map used in the web view"
Jean-Baptiste Queru [Wed, 9 Jun 2010 14:28:50 +0000 (07:28 -0700)]
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
Jean-Baptiste Queru [Tue, 8 Jun 2010 22:43:02 +0000 (15:43 -0700)]
Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:19:51 +0000 (10:19 -0700)]
Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https."
Jean-Baptiste Queru [Mon, 7 Jun 2010 21:51:42 +0000 (14:51 -0700)]
Merge "Canvas.drawVertices: correct color range-check"
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"
Kenny Root [Wed, 2 Jun 2010 05:56:39 +0000 (22:56 -0700)]
Merge "Improved error-handling in Rfc822Tokenizer"
Romain Guy [Wed, 19 May 2010 16:03:57 +0000 (09:03 -0700)]
Merge "Don't allow invalid Uris to be added as observers."
Jean-Baptiste Queru [Wed, 19 May 2010 15:35:21 +0000 (08:35 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed."
Romain Guy [Wed, 19 May 2010 07:03:34 +0000 (00:03 -0700)]
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
Romain Guy [Wed, 19 May 2010 07:01:55 +0000 (00:01 -0700)]
Merge "Text disappears when selecting text in text editor."
Romain Guy [Wed, 19 May 2010 07:01:02 +0000 (00:01 -0700)]
Merge "Removed Calls to deprecated APIs"
Romain Guy [Wed, 19 May 2010 06:51:16 +0000 (23:51 -0700)]
Merge "Improved error handling when font loading fails."
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
Jean-Baptiste Queru [Tue, 18 May 2010 17:34:42 +0000 (10:34 -0700)]
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
Jean-Baptiste Queru [Tue, 18 May 2010 17:14:14 +0000 (10:14 -0700)]
Merge "Abort FDN delete when number is empty (instead of name)"
Jean-Baptiste Queru [Mon, 17 May 2010 16:12:43 +0000 (09:12 -0700)]
Merge "Updated RGB LED test cases"
Romain Guy [Sat, 15 May 2010 19:34:05 +0000 (12:34 -0700)]
Merge "Fixing indeterminate progress bar animation state."
Jeff Hamilton [Sat, 15 May 2010 02:36:40 +0000 (19:36 -0700)]
Merge "Modified libdrm to support SuperH platform"
Jean-Baptiste Queru [Fri, 14 May 2010 20:39:48 +0000 (13:39 -0700)]
Merge "Only hold a weak pointer on SurfaceComposerClients"
Jean-Baptiste Queru [Fri, 14 May 2010 18:39:06 +0000 (11:39 -0700)]
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
Jean-Baptiste Queru [Fri, 14 May 2010 16:06:43 +0000 (09:06 -0700)]
Merge "Accept media files by file extension in case insensitive manner."
Joe Onorato [Thu, 13 May 2010 23:33:22 +0000 (16:33 -0700)]
Merge "Put the wifi status icon in the right place."
Dianne Hackborn [Thu, 13 May 2010 20:25:16 +0000 (13:25 -0700)]
Merge "Corrected debug message in WindowManager"
Jean-Baptiste Queru [Thu, 13 May 2010 18:39:51 +0000 (11:39 -0700)]
Merge "New test in FrameworkTest for the VelocityTracker class"
Jean-Baptiste Queru [Thu, 13 May 2010 18:06:28 +0000 (11:06 -0700)]
Merge "Preserve '+' in phone numbers imported from SIM."
Dianne Hackborn [Tue, 11 May 2010 19:07:32 +0000 (12:07 -0700)]
Merge "Corrected repeat count for key repeat in input device."
Jean-Baptiste Queru [Tue, 11 May 2010 16:13:19 +0000 (09:13 -0700)]
Merge "Support to display message when operation is blocked due to FDN being enabled"
Jean-Baptiste Queru [Tue, 11 May 2010 16:08:24 +0000 (09:08 -0700)]
Merge "Notify user regarding invalid number during MO call."
Mathias Agopian [Tue, 11 May 2010 03:28:02 +0000 (20:28 -0700)]
Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms"
Mathias Agopian [Tue, 11 May 2010 03:26:24 +0000 (20:26 -0700)]
Merge "Fix glReadPixels() to verify that both x and y are non-negative."
Jean-Baptiste Queru [Mon, 10 May 2010 18:14:01 +0000 (11:14 -0700)]
Merge "Include the API level 4 fields in the Parcel."
Jean-Baptiste Queru [Mon, 10 May 2010 15:55:17 +0000 (08:55 -0700)]
Merge "long modifier was on the wrong argument."
Jean-Baptiste Queru [Fri, 7 May 2010 19:57:02 +0000 (12:57 -0700)]
Merge "Added WEB_URL_PATTERN for Montenegro ".me""
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Jean-Baptiste Queru [Wed, 5 May 2010 23:30:53 +0000 (16:30 -0700)]
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
Jean-Baptiste Queru [Wed, 5 May 2010 23:18:30 +0000 (16:18 -0700)]
Merge "Type Zero Sms should not be displayed/stored/notified."
Jean-Baptiste Queru [Wed, 5 May 2010 20:49:58 +0000 (13:49 -0700)]
Merge "Add new keycodes for the convenience of Japanese IMEs"
mogimo [Fri, 2 Oct 2009 18:13:56 +0000 (03:13 +0900)]
Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
Jean-Baptiste Queru [Wed, 5 May 2010 20:15:24 +0000 (13:15 -0700)]
Merge "telephony: Fix CID when CID is unknown"
Jean-Baptiste Queru [Wed, 5 May 2010 18:16:31 +0000 (11:16 -0700)]
Merge "Call register_localized_collators() with the current locale."
Dianne Hackborn [Wed, 5 May 2010 06:58:26 +0000 (23:58 -0700)]
Merge "Set alpha value for newly created dim surface."
Jean-Baptiste Queru [Tue, 4 May 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Fix for bug
2467152 files with spaces fail to open."
Romain Guy [Mon, 3 May 2010 23:25:34 +0000 (16:25 -0700)]
Merge "Fix typo of <p> end tag in appwidgets.xml"
Jean-Baptiste Queru [Thu, 29 Apr 2010 17:03:40 +0000 (10:03 -0700)]
Merge "Fix an NPE in InputMethodService when mExtractAction is null."
Kenny Root [Thu, 22 Apr 2010 03:06:51 +0000 (20:06 -0700)]
Merge "Fix broken logic in SettingsProvider.parseProviderList."
Michael Richardson [Tue, 3 Nov 2009 22:01:28 +0000 (17:01 -0500)]
Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
Matt Fischer [Mon, 22 Feb 2010 23:40:46 +0000 (17:40 -0600)]
Only hold a weak pointer on SurfaceComposerClients
Each process maintains an array of active SurfaceComposerClient
objects, so that they can be reused as new surfaces are parceled
across. When a SurfaceComposerClient is disposed, it will remove
itself from this list. However, because the list maintains a strong
reference on the object, a reference cycle is created, and the
client is never deleted.
This patch changes the list to maintain weak pointers on the clients
instead.
Change-Id: I93dc8155fe28b4e350366a3400cdf22a8c77cdd3
Dianne Hackborn [Sat, 3 Apr 2010 22:31:54 +0000 (15:31 -0700)]
Merge "Fix reporting of window visibility in WindowManagerService."
Chih-Wei Huang [Wed, 27 May 2009 07:52:50 +0000 (15:52 +0800)]
Add keycodes PageUp and PageDown
This is useful for applications like web browser.
Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
David Turner [Tue, 30 Mar 2010 21:50:44 +0000 (14:50 -0700)]
Merge "gl_code : add end of line."
The Android Open Source Project [Tue, 30 Mar 2010 18:13:47 +0000 (11:13 -0700)]
merge from open-source master
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
Romain Guy [Tue, 30 Mar 2010 17:54:40 +0000 (10:54 -0700)]
Merge "Fix last character of password field being visible after rotation"
Dianne Hackborn [Fri, 26 Mar 2010 02:23:09 +0000 (19:23 -0700)]
Merge "Fix Memory Leak When Switching Input Methods"
Jae-Hyung Ahn [Mon, 30 Nov 2009 08:30:21 +0000 (17:30 +0900)]
gl_code : add end of line.
Signed-off-by: Jae-Hyung Ahn <jerry.ahn@windriver.com>
The Android Open Source Project [Mon, 22 Mar 2010 23:13:27 +0000 (16:13 -0700)]
merge from open-source master
Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8
Mathias Agopian [Mon, 22 Mar 2010 20:17:50 +0000 (13:17 -0700)]
Merge "Updated to WMM2010"
Nick Pelly [Mon, 22 Mar 2010 14:07:15 +0000 (07:07 -0700)]
Merge "Everytime Bluetooth was turned off two file descriptors were not closed"
The Android Open Source Project [Fri, 19 Mar 2010 23:36:32 +0000 (16:36 -0700)]
merge from open-source master
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
Wink Saville [Thu, 18 Mar 2010 19:01:07 +0000 (12:01 -0700)]
Merge "Retry pending memory status update to modem when radio is ON."
The Android Open Source Project [Tue, 9 Mar 2010 00:43:28 +0000 (16:43 -0800)]
merge from open-source master
Change-Id: Ib18c1121d51bd176e0de1666cad19ef10261825a
The Android Open Source Project [Mon, 1 Mar 2010 17:30:21 +0000 (09:30 -0800)]
merge from open-source master
The Android Open Source Project [Thu, 25 Feb 2010 22:54:51 +0000 (14:54 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)]
merge from open-source master
Romain Guy [Wed, 24 Feb 2010 06:23:21 +0000 (22:23 -0800)]
Merge "These changes add access to some status values in widgets listed below:"
Eric Laurent [Mon, 22 Feb 2010 19:13:08 +0000 (11:13 -0800)]
Magnus Landqvist [Fri, 19 Feb 2010 11:06:59 +0000 (12:06 +0100)]
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
This prevents crashes on snapdragon processors.
Joe Onorato [Thu, 18 Feb 2010 12:52:46 +0000 (04:52 -0800)]
am
ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp
* commit '
ee3bbefd34fd5330ebbc59175a328197ab7526af':
Don't crash the system process when apps give us a bad foreground service notification.
Joe Onorato [Thu, 18 Feb 2010 12:46:32 +0000 (04:46 -0800)]
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
Romain Guy [Thu, 18 Feb 2010 05:22:52 +0000 (21:22 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:17:48 +0000 (21:17 -0800)]
Romain Guy [Thu, 18 Feb 2010 05:10:34 +0000 (21:10 -0800)]
am
8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #
2428005.
Merge commit '
8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '
8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
android-build SharedAccount [Tue, 16 Feb 2010 20:53:04 +0000 (12:53 -0800)]
Wink Saville [Sat, 13 Feb 2010 17:42:07 +0000 (09:42 -0800)]
am
6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp
* commit '
6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
Always assume evdoXxxx signal strength values are correct.
Wink Saville [Sat, 13 Feb 2010 17:36:17 +0000 (09:36 -0800)]
Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Xavier Ducrohet [Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)]
am
2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp
* commit '
2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Xavier Ducrohet [Sat, 13 Feb 2010 01:48:36 +0000 (17:48 -0800)]
Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Scott Main [Fri, 12 Feb 2010 23:29:27 +0000 (15:29 -0800)]
am
19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '
19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp
* commit '
19bc31c32d75ebebacd85cac2cf4c31108329613':
docs: remove old tutorial and sample pages from the sitemap
Scott Main [Fri, 12 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Jason Sams [Fri, 12 Feb 2010 19:27:01 +0000 (11:27 -0800)]
am
0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp
* commit '
0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8':
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
The Android Open Source Project [Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)]
merge from open-source master
Eric Laurent [Thu, 11 Feb 2010 17:34:59 +0000 (09:34 -0800)]
am
c1eba82b: Merge "Fix issue:
2413494: Add TTY support." into eclair
Merge commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp
* commit '
c1eba82ba479006045c1d7a4c8ceba116a9602d1':
Fix issue:
2413494: Add TTY support.
Eric Laurent [Thu, 11 Feb 2010 17:23:21 +0000 (09:23 -0800)]
Merge "Fix issue:
2413494: Add TTY support." into eclair
Dirk Dougherty [Wed, 10 Feb 2010 17:41:15 +0000 (09:41 -0800)]
am
d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit '
d74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp
* commit '
d74bf1623913bade8f58369f39ebc666d551bb57':
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Bart Sears [Wed, 10 Feb 2010 17:41:06 +0000 (09:41 -0800)]
am
a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp
* commit '
a1ab9766718e11cb31bd5e87cda2a2bac03573db':
DO NOT MERGE
Dirk Dougherty [Wed, 10 Feb 2010 17:38:01 +0000 (09:38 -0800)]
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Bart Sears [Wed, 10 Feb 2010 17:35:37 +0000 (09:35 -0800)]
Merge "DO NOT MERGE" into eclair
Bart Sears [Wed, 10 Feb 2010 17:18:37 +0000 (09:18 -0800)]
am
926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp
* commit '
926780b023a09d37e8dcf1fabf6fa990f042f06d':
DO NOT MERGE
Bart Sears [Wed, 10 Feb 2010 17:13:48 +0000 (09:13 -0800)]
Merge "DO NOT MERGE" into eclair
Dirk Dougherty [Wed, 10 Feb 2010 02:44:18 +0000 (18:44 -0800)]
am
859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp
* commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Dirk Dougherty [Wed, 10 Feb 2010 02:41:32 +0000 (18:41 -0800)]
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Adam Powell [Tue, 9 Feb 2010 21:19:25 +0000 (13:19 -0800)]
Manually merged VelocityTracker changes
Adam Powell [Tue, 9 Feb 2010 18:55:57 +0000 (10:55 -0800)]
am
e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp
* commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6':
Cleanup fixes for ScaleGestureDetector
Suchi Amalapurapu [Tue, 9 Feb 2010 01:27:33 +0000 (17:27 -0800)]
am
08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp
* commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05':
Add null checks when scanning a package.
The Android Open Source Project [Fri, 5 Feb 2010 21:55:16 +0000 (13:55 -0800)]
merge from open-source master
Adam Powell [Fri, 5 Feb 2010 21:01:22 +0000 (13:01 -0800)]
Merge "Use a circular buffer in VelocityTracker"
Romain Guy [Fri, 5 Feb 2010 18:33:44 +0000 (10:33 -0800)]
Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"
The Android Open Source Project [Fri, 5 Feb 2010 16:48:38 +0000 (08:48 -0800)]
am
31bfdf69: reconcile main tree with open-source eclair
Merge commit '
31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '
31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #
2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
OSDN Git Service
