OSDN Git Service
Dianne Hackborn [Wed, 31 Mar 2010 18:14:13 +0000 (11:14 -0700)]
am
e259bc77: Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Merge commit '
e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp
* commit '
e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
Fix issue #
2558391: Package manager problem when not replacing existing system partition app
Fred Quintana [Wed, 31 Mar 2010 18:04:48 +0000 (11:04 -0700)]
am
9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit '
9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp
* commit '
9b9a89a58f50c3004959c36252489fae54fb9c58':
added a cleanspec since ActiveSyncInfo.aidl was removed
Fred Quintana [Wed, 31 Mar 2010 18:01:41 +0000 (11:01 -0700)]
Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Patrick Scott [Wed, 31 Mar 2010 18:00:39 +0000 (11:00 -0700)]
am
92534469: Use case insensitive matching.
Merge commit '
9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp
* commit '
9253446922d925f6a5453b60d539beed292921a7':
Use case insensitive matching.
Eric Olsen [Wed, 31 Mar 2010 17:07:36 +0000 (10:07 -0700)]
am
71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '
711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp
* commit '
711065587b46ea0279788757c49a273ff796f844':
Add thermal shutdown. If battery temp >= 68C.
Eric Olsen [Wed, 31 Mar 2010 17:04:24 +0000 (10:04 -0700)]
Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Andreas Huber [Wed, 31 Mar 2010 16:51:33 +0000 (09:51 -0700)]
am
5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit '
5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp
* commit '
5c1e96bbc7f71fc3512706af878599fdfbdb7690':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Andreas Huber [Wed, 31 Mar 2010 16:48:22 +0000 (09:48 -0700)]
Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Robert Greenwalt [Wed, 31 Mar 2010 15:35:16 +0000 (08:35 -0700)]
am
0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '
0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp
* commit '
0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
Fix HttpProxy.
Robert Greenwalt [Wed, 31 Mar 2010 15:32:03 +0000 (08:32 -0700)]
Merge "Fix HttpProxy." into froyo
Bjorn Bringert [Wed, 31 Mar 2010 14:21:13 +0000 (07:21 -0700)]
am
11a7ba36: Support for apps search in apps provider contract
Merge commit '
11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp
* commit '
11a7ba367f39175f41300f384ec6e984bcc08d53':
Support for apps search in apps provider contract
Jeff Brown [Wed, 31 Mar 2010 06:32:12 +0000 (23:32 -0700)]
am
07330791: Show SD unavailable icon for apps on SD when ejected.
Merge commit '
07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp
* commit '
07330791116513710d879c45b2f095cd314cbfd0':
Show SD unavailable icon for apps on SD when ejected.
Dianne Hackborn [Wed, 31 Mar 2010 04:10:45 +0000 (21:10 -0700)]
am
966fcb81: Revert "fix [
2542425] memory leak during video recording"
Merge commit '
966fcb81eece9096040ccc185bb662335d3964cf' into froyo-plus-aosp
* commit '
966fcb81eece9096040ccc185bb662335d3964cf':
Revert "fix [
2542425] memory leak during video recording"
Dianne Hackborn [Wed, 31 Mar 2010 04:04:17 +0000 (21:04 -0700)]
Revert "fix [
2542425] memory leak during video recording"
This reverts commit
544592e14f8d7643238e40ba9879727497900f35.
Mathias Agopian [Wed, 31 Mar 2010 02:06:51 +0000 (19:06 -0700)]
am
544592e1: fix [
2542425] memory leak during video recording
Merge commit '
544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp
* commit '
544592e14f8d7643238e40ba9879727497900f35':
fix [
2542425] memory leak during video recording
Mathias Agopian [Tue, 30 Mar 2010 23:53:40 +0000 (16:53 -0700)]
fix [
2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
Fred Quintana [Wed, 31 Mar 2010 01:38:46 +0000 (18:38 -0700)]
am
77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization sync extra -
Merge commit '
77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp
* commit '
77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
- changed periodic sync scheduling to just creating pending
Fred Quintana [Wed, 31 Mar 2010 01:24:19 +0000 (18:24 -0700)]
am
23243aca: missing current.xml change
Merge commit '
23243acabdf8ff6022395cf67632c8387d286989' into froyo-plus-aosp
* commit '
23243acabdf8ff6022395cf67632c8387d286989':
missing current.xml change
Fred Quintana [Wed, 31 Mar 2010 01:24:15 +0000 (18:24 -0700)]
am
d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a
Merge commit '
d5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp
* commit '
d5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
some changes due to an API review
Mike Lockwood [Wed, 31 Mar 2010 00:32:24 +0000 (17:32 -0700)]
am
8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp
* commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
Add support for GPS privacy lock. DO NOT MERGE
Mike Lockwood [Wed, 31 Mar 2010 00:29:41 +0000 (17:29 -0700)]
Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Daniel Lehmann [Wed, 31 Mar 2010 00:01:45 +0000 (17:01 -0700)]
am
58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:
2546767" into froyo
Merge commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp
* commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
Don't load photo if it's id is 0. Saves one database query
Daniel Lehmann [Tue, 30 Mar 2010 23:58:38 +0000 (16:58 -0700)]
Merge "Don't load photo if it's id is 0. Saves one database query Bug:
2546767" into froyo
Adam Powell [Tue, 30 Mar 2010 23:50:41 +0000 (16:50 -0700)]
am
3ac51b3d: Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp
* commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items
Christopher Tate [Tue, 30 Mar 2010 23:50:36 +0000 (16:50 -0700)]
am
27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp
* commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
API CHANGE: @hide AbsoluteFileBackupHelper
Adam Powell [Tue, 30 Mar 2010 23:46:21 +0000 (16:46 -0700)]
Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Dianne Hackborn [Tue, 30 Mar 2010 23:00:41 +0000 (16:00 -0700)]
am
5cdd7858: Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Merge commit '
5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp
* commit '
5cdd78589db7f31c59df2e40146bd761a6570d13':
Fix issue #
2553553: API REVIEW: android.context.Context
Dianne Hackborn [Tue, 30 Mar 2010 22:55:37 +0000 (15:55 -0700)]
Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Andreas Huber [Tue, 30 Mar 2010 22:44:23 +0000 (15:44 -0700)]
am
99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp
* commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
Properly fill in the component name for the software decoders.
Andreas Huber [Tue, 30 Mar 2010 22:40:38 +0000 (15:40 -0700)]
Merge "Properly fill in the component name for the software decoders." into froyo
Amith Yamasani [Tue, 30 Mar 2010 22:24:51 +0000 (15:24 -0700)]
am
95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp
* commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0':
Fix for Never not existing in latest timeout values.
Amith Yamasani [Tue, 30 Mar 2010 22:19:00 +0000 (15:19 -0700)]
Merge "Fix for Never not existing in latest timeout values." into froyo
Grace Kloba [Tue, 30 Mar 2010 21:56:14 +0000 (14:56 -0700)]
am
eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '
eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp
* commit '
eb643f2685bd404ef5abb622123cea0aa17939d7':
Remove the shadow under url bar.
Grace Kloba [Tue, 30 Mar 2010 21:51:48 +0000 (14:51 -0700)]
Merge "Remove the shadow under url bar." into froyo
Irfan Sheriff [Tue, 30 Mar 2010 20:51:46 +0000 (13:51 -0700)]
Dianne Hackborn [Tue, 30 Mar 2010 20:40:24 +0000 (13:40 -0700)]
am
de2722af: Merge "Package manager optimizations." into froyo
Merge commit '
de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp
* commit '
de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
Package manager optimizations.
Dianne Hackborn [Tue, 30 Mar 2010 20:35:33 +0000 (13:35 -0700)]
Merge "Package manager optimizations." into froyo
Andreas Huber [Tue, 30 Mar 2010 20:34:39 +0000 (13:34 -0700)]
am
8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo
Merge commit '
8899186b60bcbfa783217a0f773e4cd032911f3c' into froyo-plus-aosp
* commit '
8899186b60bcbfa783217a0f773e4cd032911f3c':
Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
Andreas Huber [Tue, 30 Mar 2010 20:31:57 +0000 (13:31 -0700)]
Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo
Christopher Tate [Tue, 30 Mar 2010 20:13:52 +0000 (13:13 -0700)]
am
22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '
22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp
* commit '
22375e4a736c0d646c3cf0905c15126f7f4107c2':
Make RestoreSession.getAvailableRestoreSets() asynchronous
Christopher Tate [Tue, 30 Mar 2010 20:09:50 +0000 (13:09 -0700)]
Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Daniel Sandler [Tue, 30 Mar 2010 19:53:28 +0000 (12:53 -0700)]
Patrick Scott [Tue, 30 Mar 2010 18:45:55 +0000 (11:45 -0700)]
am
ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit '
ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp
* commit '
ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
Fix a simple logic mistake.
Patrick Scott [Tue, 30 Mar 2010 18:41:29 +0000 (11:41 -0700)]
Merge "Fix a simple logic mistake." into froyo
Jean-Michel Trivi [Tue, 30 Mar 2010 18:20:32 +0000 (11:20 -0700)]
am
2a5d9f9b: Fix bug
2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '
2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp
* commit '
2a5d9f9b577376768372837723f0f42098aba13b':
Fix bug
2553592 API REVIEW: android.speech
San Mehat [Tue, 30 Mar 2010 17:39:36 +0000 (10:39 -0700)]
am
d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit '
d4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp
* commit '
d4610977d9217cbd70dd59f61914c74d1ca61036':
framework: Hide StorageManager for froyo - DO NOT MERGE
San Mehat [Tue, 30 Mar 2010 17:35:44 +0000 (10:35 -0700)]
Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Jaikumar Ganesh [Tue, 30 Mar 2010 17:30:48 +0000 (10:30 -0700)]
am
0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '
0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp
* commit '
0e09030977aea8b40fd177139528d4b5637c9771':
Relax the requirement of making a DBUS call for creating the Bluez Device.
Kenny Root [Tue, 30 Mar 2010 16:27:15 +0000 (09:27 -0700)]
am
7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '
7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp
* commit '
7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
Import revised translations
Kenny Root [Tue, 30 Mar 2010 16:23:16 +0000 (09:23 -0700)]
Merge "Import revised translations" into froyo
Bjorn Bringert [Tue, 30 Mar 2010 10:59:36 +0000 (03:59 -0700)]
am
fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit '
fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp
* commit '
fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
Clean up SearchableInfo API, JavaDoc and formatting
Dianne Hackborn [Tue, 30 Mar 2010 04:19:39 +0000 (21:19 -0700)]
am
e2522466: Fix issue #
2547337: switching night modes
Merge commit '
e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp
* commit '
e2522466552f9c6b7fcea866709710f53aa1f2a8':
Fix issue #
2547337: switching night modes
Dianne Hackborn [Tue, 30 Mar 2010 04:19:36 +0000 (21:19 -0700)]
am
ad5499dd: Hopefully get rid of some ANRs.
Merge commit '
ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp
* commit '
ad5499dd204a1512471778462a805a288595f2f2':
Hopefully get rid of some ANRs.
Adam Powell [Tue, 30 Mar 2010 04:02:47 +0000 (21:02 -0700)]
am
9d32d24d: Remove overscrolling
Merge commit '
9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp
* commit '
9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
Remove overscrolling
Oscar Montemayor [Tue, 30 Mar 2010 02:01:16 +0000 (19:01 -0700)]
am
f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Merge commit '
f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp
* commit '
f5f300678abb79574bb56eee13c8dd2b7b98b740':
DO NOT MERGE
Oscar Montemayor [Tue, 30 Mar 2010 01:56:57 +0000 (18:56 -0700)]
Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Charles Chen [Tue, 30 Mar 2010 01:41:48 +0000 (18:41 -0700)]
am
a599dafe: Merge "Fix for bug
2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Merge commit '
a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp
* commit '
a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
Fix for bug
2548048 - it was impossible for applications to discover
Charles Chen [Tue, 30 Mar 2010 01:37:41 +0000 (18:37 -0700)]
Merge "Fix for bug
2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Amith Yamasani [Tue, 30 Mar 2010 01:28:14 +0000 (18:28 -0700)]
am
8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Merge commit '
8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '
8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Amith Yamasani [Tue, 30 Mar 2010 01:24:59 +0000 (18:24 -0700)]
Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Oscar Montemayor [Sat, 27 Mar 2010 01:44:14 +0000 (18:44 -0700)]
DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#
2502219.
Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
Joe Onorato [Tue, 30 Mar 2010 01:10:09 +0000 (18:10 -0700)]
Romain Guy [Mon, 29 Mar 2010 23:34:46 +0000 (16:34 -0700)]
am
691b806f: Merge "Fix possible security issue. Bug #
2553187" into froyo
Merge commit '
691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp
* commit '
691b806ff8b4a6428588e8495cb1a5819a0aee99':
Fix possible security issue.
Romain Guy [Mon, 29 Mar 2010 23:31:14 +0000 (16:31 -0700)]
Merge "Fix possible security issue. Bug #
2553187" into froyo
Ben Cheng [Mon, 29 Mar 2010 23:25:13 +0000 (16:25 -0700)]
am
ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit '
ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit '
ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Steve Howard [Mon, 29 Mar 2010 23:25:09 +0000 (16:25 -0700)]
am
8deb2391: Merge "Remove upside-down portrait orientation." into froyo
Merge commit '
8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp
* commit '
8deb239169f9b60cf19b6f4293978e654fa15a03':
Remove upside-down portrait orientation.
Steve Howard [Mon, 29 Mar 2010 23:05:35 +0000 (16:05 -0700)]
Merge "Remove upside-down portrait orientation." into froyo
Christopher Tate [Mon, 29 Mar 2010 22:53:54 +0000 (15:53 -0700)]
am
3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '
3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '
3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Mathias Agopian [Mon, 29 Mar 2010 22:53:48 +0000 (15:53 -0700)]
am
a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
Merge commit '
a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp
* commit '
a019df875d991ce61c93720f37c036655723f5f6':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
Mathias Agopian [Mon, 29 Mar 2010 22:53:44 +0000 (15:53 -0700)]
am
04fdd180: Merge "fix [
2542425] memory leak during video recording" into froyo
Merge commit '
04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '
04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [
2542425] memory leak during video recording
Christopher Tate [Mon, 29 Mar 2010 22:50:57 +0000 (15:50 -0700)]
Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:48 +0000 (15:44 -0700)]
Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:33 +0000 (15:44 -0700)]
Merge "fix [
2542425] memory leak during video recording" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 22:39:56 +0000 (15:39 -0700)]
am
c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Merge commit '
c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit '
c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Andreas Huber [Mon, 29 Mar 2010 22:39:53 +0000 (15:39 -0700)]
am
02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Merge commit '
02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp
* commit '
02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Dirk Dougherty [Mon, 29 Mar 2010 22:36:53 +0000 (15:36 -0700)]
Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Andreas Huber [Mon, 29 Mar 2010 22:16:20 +0000 (15:16 -0700)]
Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:12:19 +0000 (15:12 -0700)]
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
Jim Miller [Mon, 29 Mar 2010 22:11:01 +0000 (15:11 -0700)]
am
c6dc5070: Merge "Fix
2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Merge commit '
c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp
* commit '
c6dc5070ef663e514add038b1d2e78761156b0c0':
Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
Jim Miller [Mon, 29 Mar 2010 22:07:06 +0000 (15:07 -0700)]
Merge "Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Romain Guy [Mon, 29 Mar 2010 22:05:05 +0000 (15:05 -0700)]
Romain Guy [Mon, 29 Mar 2010 21:49:09 +0000 (14:49 -0700)]
am
6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #
2553515 #
2553595
Merge commit '
6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp
* commit '
6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
Rename tab widget attributes, remove scroll barrier constant.
Doug Zongker [Mon, 29 Mar 2010 21:00:58 +0000 (14:00 -0700)]
am
ab69e29c: relocate android.util.base64.* -> android.util.*
Merge commit '
ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp
* commit '
ab69e29c1927bdc6143324eba5ccd78f7c43128d':
relocate android.util.base64.* -> android.util.*
Mathias Agopian [Mon, 29 Mar 2010 20:45:18 +0000 (13:45 -0700)]
fix [
2542425] memory leak during video recording
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
Romain Guy [Mon, 29 Mar 2010 20:06:20 +0000 (13:06 -0700)]
am
272b504e: Merge "Tame the monkey. Bug #
2547546" into froyo
Merge commit '
272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp
* commit '
272b504ee6aaf2515572520cd642f9a4fbf81a44':
Tame the monkey.
Dirk Dougherty [Mon, 29 Mar 2010 20:06:17 +0000 (13:06 -0700)]
am
12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Merge commit '
12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp
* commit '
12cd8a3c27aac27832d42f559afeebf0d95f14d3':
doc change: Indicate that only the first 8 characters of the key alias are used.
Andreas Huber [Mon, 29 Mar 2010 20:01:27 +0000 (13:01 -0700)]
am
1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Merge commit '
1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp
* commit '
1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
Romain Guy [Mon, 29 Mar 2010 20:00:42 +0000 (13:00 -0700)]
Merge "Tame the monkey. Bug #
2547546" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 20:00:37 +0000 (13:00 -0700)]
Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Andreas Huber [Mon, 29 Mar 2010 19:58:03 +0000 (12:58 -0700)]
Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Romain Guy [Mon, 29 Mar 2010 19:34:23 +0000 (12:34 -0700)]
am
0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '
0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp
* commit '
0e1229260d66b308a0ad271c20970e3decd6f55c':
Rename private fields to break bad code examples
Romain Guy [Mon, 29 Mar 2010 19:28:20 +0000 (12:28 -0700)]
Merge "Rename private fields to break bad code examples" into froyo
Jack Palevich [Mon, 29 Mar 2010 19:22:08 +0000 (12:22 -0700)]
am
5d961085: Add a test of EGL pausing and resuming.
Merge commit '
5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp
* commit '
5d961085c33d17e43330ed2d3ada03ffcfa04817':
Add a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:09:57 +0000 (12:09 -0700)]
Add a test of EGL pausing and resuming.
Irfan Sheriff [Mon, 29 Mar 2010 19:07:37 +0000 (12:07 -0700)]
Romain Guy [Mon, 29 Mar 2010 18:28:07 +0000 (11:28 -0700)]
am
ab924c90: Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
Merge commit '
ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp
* commit '
ab924c909a516eb71fef7c238a20c7755f8170ed':
Make EditTextPreference scrollable.
Romain Guy [Mon, 29 Mar 2010 18:24:31 +0000 (11:24 -0700)]
Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
The Android Open Source Project [Mon, 29 Mar 2010 18:04:30 +0000 (11:04 -0700)]
merge from open-source master
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
The Android Open Source Project [Mon, 29 Mar 2010 17:57:04 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
Daniel Lehmann [Mon, 29 Mar 2010 17:30:54 +0000 (10:30 -0700)]
Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:
2542703 Bug:
2549485" into froyo
OSDN Git Service
