OSDN Git Service
Wu-cheng Li [Thu, 10 Dec 2009 15:01:12 +0000 (07:01 -0800)]
am
90073aad: am
ebc77994: am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '
90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Dianne Hackborn [Thu, 10 Dec 2009 15:00:47 +0000 (07:00 -0800)]
am
aeabdf32: am
0766b2d0: Update service example code.
Merge commit '
aeabdf32a2a38c1627102b90628b7261447d3a5c'
* commit '
aeabdf32a2a38c1627102b90628b7261447d3a5c':
Update service example code.
Mike Lockwood [Thu, 10 Dec 2009 15:00:22 +0000 (07:00 -0800)]
am
20db8604: am
259e3384: am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
20db86042618e6ef422e28a9e328336b98d526b7'
* commit '
20db86042618e6ef422e28a9e328336b98d526b7':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Thu, 10 Dec 2009 14:59:55 +0000 (06:59 -0800)]
am
517ebaa6: am
18ff0e32: am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
517ebaa69a9c4baed99bb5667b956dab129c96e7'
* commit '
517ebaa69a9c4baed99bb5667b956dab129c96e7':
remove an old STOPSHIP comment
Doug Kwan [Thu, 10 Dec 2009 00:32:04 +0000 (16:32 -0800)]
Add missing library in linker option. Currently the library is used by the
executable but not specified. It is included via dependency of another shared
object.
Android (Google) Code Review [Thu, 10 Dec 2009 00:07:57 +0000 (16:07 -0800)]
Merge change I5ddc721d
* changes:
Add misssing symbol type directives.
Wu-cheng Li [Wed, 9 Dec 2009 23:42:20 +0000 (15:42 -0800)]
am
ebc77994: am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp
* commit '
ebc7799444ccd4d34863f1a07e885ca423a49c43':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Dianne Hackborn [Wed, 9 Dec 2009 23:41:30 +0000 (15:41 -0800)]
am
0766b2d0: Update service example code.
Merge commit '
0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '
0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
Mike Lockwood [Wed, 9 Dec 2009 23:40:44 +0000 (15:40 -0800)]
am
259e3384: am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp
* commit '
259e3384face72ea8e30696d7bae492d37d44e8b':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Wed, 9 Dec 2009 23:40:06 +0000 (15:40 -0800)]
am
18ff0e32: am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp
* commit '
18ff0e329b314e033e4bfb92b24ecab961f0eb99':
remove an old STOPSHIP comment
Android (Google) Code Review [Wed, 9 Dec 2009 04:13:44 +0000 (20:13 -0800)]
Merge change Ibe6eac82
* changes:
Implement Matrix Palette extension.
Jaikumar Ganesh [Tue, 8 Dec 2009 22:50:43 +0000 (14:50 -0800)]
am
dbdabca7: am
b08170ad: am
ae88e2d1: Merge change I38227501 into eclair
Merge commit '
dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4'
* commit '
dbdabca716e0873a7c36d4f1ddd0fdb5ca412bc4':
Add API to get Active Sinks.
Robert Greenwalt [Tue, 8 Dec 2009 22:50:31 +0000 (14:50 -0800)]
am
dbf68aa3: (-s ours) am
54a4a66d: am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
dbf68aa372078f4f55a267e1eb182dd360384467'
* commit '
dbf68aa372078f4f55a267e1eb182dd360384467':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Tue, 8 Dec 2009 22:50:15 +0000 (14:50 -0800)]
am
1fbc280d: am
47cc8112: am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
1fbc280dac0ce5089ff1491612944344af8d72b4'
* commit '
1fbc280dac0ce5089ff1491612944344af8d72b4':
Fix updating Bluetooth icon on status bar and for Wifi.
Robert Greenwalt [Tue, 8 Dec 2009 21:30:56 +0000 (13:30 -0800)]
resolved conflicts for merge of
47a2573e to master
Doug Kwan [Mon, 7 Dec 2009 21:21:24 +0000 (13:21 -0800)]
Add misssing symbol type directives.
Jack Palevich [Tue, 8 Dec 2009 07:43:51 +0000 (15:43 +0800)]
Implement Matrix Palette extension.
Adds support for formerly-unimplemented methods:
glCurrentPaletteMatrixOES
glLoadPaletteFromModelViewMatrixOES
glMatrixIndexPointerOES
glWeightPointerOES
The bulk of the changes are related to implementing the two PointerOES
methods, which are implemented pretty much the same way as the existing
Pointer methods were implemented.
This change also changes the way glPointSizePointerOES is implemented,
making it act like all the other Pointer methods. (Previously it was
not handling non-direct-buffer arguments correctly.)
Fixes bug
2308625 "Support matrix palette skinning
in JSR239 and related APIs"
Also updated GLLogWraper to fix two bugs in GLLogWrapper that were
discovered while testing matrix palette skinning support:
a) Handle trying to print the contents of null-but-enabled buffers.
(It's not legal to draw with null-but-enabled buffers, and
in fact some OpenGL drivers will crash if you try to render in this
state, but there's no reason the GLLogWrapper should crash while trying
to debug this situation.
b) Don't read off the end of a vertex buffer with non-zero position when
printing the entire contents of the vertex buffer. Now we only print from
the current position to the end of the buffer.
Wu-cheng Li [Tue, 8 Dec 2009 03:38:01 +0000 (19:38 -0800)]
am
9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '
9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2
* commit '
9c79938d47a3caa06e5fb956955374f30c55992b':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Vasu Nori [Tue, 8 Dec 2009 02:38:11 +0000 (18:38 -0800)]
am
976ed437: am
6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '
976ed43786dcf078a0f802716d49644691656a24'
* commit '
976ed43786dcf078a0f802716d49644691656a24':
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Evan Millar [Tue, 8 Dec 2009 02:37:57 +0000 (18:37 -0800)]
am
4adf8017: am
b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '
4adf8017374c20f725400233fc7b039613c78caf'
* commit '
4adf8017374c20f725400233fc7b039613c78caf':
Add Sets#newSortedSet()
Andreas Huber [Tue, 8 Dec 2009 02:37:46 +0000 (18:37 -0800)]
am
9659126d: am
247003be: Merge change I250f2433 into eclair-mr2
Merge commit '
9659126db10f65b6e502b2175d34c75b301fb7e9'
* commit '
9659126db10f65b6e502b2175d34c75b301fb7e9':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Leon Scroggins [Tue, 8 Dec 2009 02:37:16 +0000 (18:37 -0800)]
am
0092ee13: am
6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '
0092ee13e4490bbd8de522d256fb4d7dab81be60'
* commit '
0092ee13e4490bbd8de522d256fb4d7dab81be60':
Set InputType of WebTextView according to <input> field's type.
Grace Kloba [Tue, 8 Dec 2009 02:37:00 +0000 (18:37 -0800)]
am
8657978a: am
ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '
8657978aabc7141869926a98a0da257255678dd4'
* commit '
8657978aabc7141869926a98a0da257255678dd4':
Expose onReceivedSslError() so that the WebView client
Grace Kloba [Tue, 8 Dec 2009 02:36:32 +0000 (18:36 -0800)]
am
a49f91a2: am
14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '
a49f91a2cb0cf39fa07d25ba896f5bf115b768e7'
* commit '
a49f91a2cb0cf39fa07d25ba896f5bf115b768e7':
Add "res" support for WebView.
Dave Sparks [Tue, 8 Dec 2009 02:36:00 +0000 (18:36 -0800)]
am
610e50cc: am
62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '
610e50ccd2a342fbc75e3b30a2057dbca8fb92fd'
* commit '
610e50ccd2a342fbc75e3b30a2057dbca8fb92fd':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Tue, 8 Dec 2009 02:35:48 +0000 (18:35 -0800)]
am
54f5ca41: am
ffacbc34: am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
54f5ca4115b776eb5a1e04a4c014acccb916ef9c'
* commit '
54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
Add Java exceptions to catch RS calls with no context or no surface.
Daniel Sandler [Tue, 8 Dec 2009 02:35:36 +0000 (18:35 -0800)]
am
0128c250: am
1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '
0128c250e3a81e5d3793126ad82b2ce3c387a4ef'
* commit '
0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
Allow room for descenders in am/pm text.
Dave Sparks [Tue, 8 Dec 2009 02:35:23 +0000 (18:35 -0800)]
am
5ac5cd73: am
9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '
5ac5cd7300fda7cb80ae0fb3d66594abd4f91939'
* commit '
5ac5cd7300fda7cb80ae0fb3d66594abd4f91939':
Remove unused Java object reference in native SoundPool code.
Eric Laurent [Tue, 8 Dec 2009 02:35:06 +0000 (18:35 -0800)]
am
bf831e0d: am
38f6bdc4: am
0a08029f: Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '
bf831e0de0fd1636a7ee2670faed208f96f23f65'
* commit '
bf831e0de0fd1636a7ee2670faed208f96f23f65':
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Andreas Huber [Tue, 8 Dec 2009 02:34:41 +0000 (18:34 -0800)]
am
2109e680: am
8c7ab034: Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Merge commit '
2109e6801199b10460330027f3537d406b6a0149'
* commit '
2109e6801199b10460330027f3537d406b6a0149':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Andreas Huber [Tue, 8 Dec 2009 02:34:13 +0000 (18:34 -0800)]
am
81a005d0: am
73abc2ea: Merge change I9c6e1f90 into eclair-mr2
Merge commit '
81a005d070bec3a756f5caa48cdda25bcc732ce9'
* commit '
81a005d070bec3a756f5caa48cdda25bcc732ce9':
Initial check in of stagefright software AAC decoder based on PV source code.
Eric Laurent [Tue, 8 Dec 2009 02:33:53 +0000 (18:33 -0800)]
am
e30bae7f: am
b8341cf7: am
6d42d806: Merge change I9cc489a2 into eclair
Merge commit '
e30bae7f8ef0489788c155ae44d9a57beca1acf5'
* commit '
e30bae7f8ef0489788c155ae44d9a57beca1acf5':
Fix issue
2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Yu Shan Emily Lau [Tue, 8 Dec 2009 02:33:38 +0000 (18:33 -0800)]
am
a3d15d3b: am
8e6d79e2: am
8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '
a3d15d3b01146df40e72d67b79dd1f9368398f23'
* commit '
a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started
Andreas Huber [Tue, 8 Dec 2009 02:32:57 +0000 (18:32 -0800)]
am
f553a584: am
5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit '
f553a58425c66a990dbc5f4579c976a0636fc573'
* commit '
f553a58425c66a990dbc5f4579c976a0636fc573':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Leon Scroggins [Tue, 8 Dec 2009 02:31:58 +0000 (18:31 -0800)]
am
0b1a9f76: am
9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '
0b1a9f7648a9e57b0eaf6766f73810de94136669'
* commit '
0b1a9f7648a9e57b0eaf6766f73810de94136669':
Show search icon for <input type="search"> fields.
Maryam Garrett [Tue, 8 Dec 2009 02:31:35 +0000 (18:31 -0800)]
am
44e537a8: am
7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '
44e537a859966378f1599db5e5d41045e78efd94'
* commit '
44e537a859966378f1599db5e5d41045e78efd94':
Improves the touch-based text selection UI in text boxes.
Dima Zavin [Tue, 8 Dec 2009 02:30:40 +0000 (18:30 -0800)]
am
0c15b889: am
401f4220: am
0019215f: Revert "When using MDP, we needed to use a texture for diming."
Merge commit '
0c15b889317e9569282e4513db598369a0506b40'
* commit '
0c15b889317e9569282e4513db598369a0506b40':
Revert "When using MDP, we needed to use a texture for diming."
Dianne Hackborn [Fri, 4 Dec 2009 23:32:22 +0000 (15:32 -0800)]
Update service example code.
Switch aidl sample to match the change in ApiDemos, add sample code
to the Service class.
Carl Shapiro [Tue, 8 Dec 2009 01:54:11 +0000 (17:54 -0800)]
Merge commit '
6f93bf9e' into manualmerge
Wu-cheng Li [Fri, 4 Dec 2009 11:59:18 +0000 (19:59 +0800)]
Document that some parameters will not be null and fix getSupportedPictureFormats.
Mike Lockwood [Tue, 8 Dec 2009 01:22:54 +0000 (17:22 -0800)]
am
7e90005f: Merge change I705b1d33 into eclair
Merge commit '
7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2
* commit '
7e90005fcb95d4c20c92e915f4418b94341dda36':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Android (Google) Code Review [Tue, 8 Dec 2009 01:17:47 +0000 (17:17 -0800)]
Merge change I705b1d33 into eclair
* changes:
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Fred Quintana [Tue, 8 Dec 2009 01:04:40 +0000 (17:04 -0800)]
am
1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '
1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2
* commit '
1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
remove an old STOPSHIP comment
Android (Google) Code Review [Tue, 8 Dec 2009 00:59:46 +0000 (16:59 -0800)]
Merge change Ia5ef9acd into eclair
* changes:
remove an old STOPSHIP comment
Jaikumar Ganesh [Mon, 7 Dec 2009 23:57:28 +0000 (15:57 -0800)]
am
b08170ad: am
ae88e2d1: Merge change I38227501 into eclair
Merge commit '
b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp
* commit '
b08170ad7e4ca4908852b0e20759ea740b338a03':
Add API to get Active Sinks.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:53:02 +0000 (15:53 -0800)]
am
ae88e2d1: Merge change I38227501 into eclair
Merge commit '
ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2
* commit '
ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
Add API to get Active Sinks.
Android (Google) Code Review [Mon, 7 Dec 2009 23:49:50 +0000 (15:49 -0800)]
Merge change I38227501 into eclair
* changes:
Add API to get Active Sinks.
Mike Lockwood [Mon, 7 Dec 2009 23:43:36 +0000 (18:43 -0500)]
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Change-Id: I705b1d33af2d70aa1084cca8f6280fade9461d2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Greenwalt [Mon, 7 Dec 2009 23:36:25 +0000 (15:36 -0800)]
am
54a4a66d: am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '
54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:36:19 +0000 (15:36 -0800)]
am
47cc8112: am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '
47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Robert Greenwalt [Mon, 7 Dec 2009 23:31:50 +0000 (15:31 -0800)]
am
9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '
9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '
9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Jaikumar Ganesh [Mon, 7 Dec 2009 23:31:43 +0000 (15:31 -0800)]
am
9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '
9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '
9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Android (Google) Code Review [Mon, 7 Dec 2009 23:27:19 +0000 (15:27 -0800)]
Merge change Ib097fbbf into eclair
* changes:
DO NOT MERGE Reverting change I53e91db7.
Android (Google) Code Review [Mon, 7 Dec 2009 23:27:02 +0000 (15:27 -0800)]
Merge change I204e4787 into eclair
* changes:
Fix updating Bluetooth icon on status bar and for Wifi.
Robert Greenwalt [Mon, 7 Dec 2009 23:20:50 +0000 (15:20 -0800)]
DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.
Do not merge this so the desired change will survive on mr2 as intended.
bug:
2265222
Jaikumar Ganesh [Fri, 4 Dec 2009 23:10:54 +0000 (15:10 -0800)]
Add API to get Active Sinks.
Allow incoming connections only when there are no active sinks.
Dr No: Eastham
Bug:
2133530
Jaikumar Ganesh [Mon, 7 Dec 2009 18:58:18 +0000 (10:58 -0800)]
Fix updating Bluetooth icon on status bar and for Wifi.
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.
This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.
Dr No: Eastham
Bug:
2133530
Robert Greenwalt [Mon, 7 Dec 2009 23:13:51 +0000 (15:13 -0800)]
am
096871e7: am
90d1b745: Merge change I53e91db7 into eclair
Merge commit '
096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp
* commit '
096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
Filter out minor Connectivity Notifications.
Robert Greenwalt [Mon, 7 Dec 2009 23:09:46 +0000 (15:09 -0800)]
am
90d1b745: Merge change I53e91db7 into eclair
Merge commit '
90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '
90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Android (Google) Code Review [Mon, 7 Dec 2009 23:04:52 +0000 (15:04 -0800)]
Merge change I53e91db7 into eclair
* changes:
Filter out minor Connectivity Notifications.
Bjorn Bringert [Mon, 7 Dec 2009 22:58:38 +0000 (14:58 -0800)]
am
8d962613: am
6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '
8d962613464b206f4c0b2323607c5e248543ad24'
* commit '
8d962613464b206f4c0b2323607c5e248543ad24':
Move android.server.search.SearchableInfo to android.app
Vasu Nori [Mon, 7 Dec 2009 22:58:04 +0000 (14:58 -0800)]
am
6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '
6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp
* commit '
6be01bf207077ffbdcd3879250171a26ec805835':
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Romain Guy [Mon, 7 Dec 2009 22:56:53 +0000 (14:56 -0800)]
am
16c82c34: am
d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit '
16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'
* commit '
16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Doug Zongker [Mon, 7 Dec 2009 22:56:30 +0000 (14:56 -0800)]
am
0f91f870: am
f6683bb5: Merge change I5f1d2d24 into eclair-mr2
Merge commit '
0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'
* commit '
0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
move event log tags used by ActivityManager into this package
Kenny Root [Mon, 7 Dec 2009 22:55:55 +0000 (14:55 -0800)]
am
b145ad1d: am
fc32a062: Merge change I88721afe into eclair-mr2
Merge commit '
b145ad1d32943745c1e712c2f4ecd01802d1f5dc'
* commit '
b145ad1d32943745c1e712c2f4ecd01802d1f5dc':
Fix bitmask in aapt's StringPool length construction
Jack Palevich [Mon, 7 Dec 2009 22:55:39 +0000 (14:55 -0800)]
am
9196034b: am
30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '
9196034b84c48844799a2904ef3ce31f18ee748e'
* commit '
9196034b84c48844799a2904ef3ce31f18ee748e':
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public
Romain Guy [Mon, 7 Dec 2009 22:55:23 +0000 (14:55 -0800)]
am
e300deaf: am
b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit '
e300deaf2fd2842240ea90fd00296a6e2ceba9d8'
* commit '
e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
Andy McFadden [Mon, 7 Dec 2009 22:55:04 +0000 (14:55 -0800)]
Android (Google) Code Review [Mon, 7 Dec 2009 22:54:36 +0000 (14:54 -0800)]
Merge change Ifa1fae13 into eclair-mr2
* changes:
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Suchi Amalapurapu [Mon, 7 Dec 2009 22:54:22 +0000 (14:54 -0800)]
am
32c66ee4: am
ccbf4c28: am
ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '
32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'
* commit '
32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
If the usage stats file doesn't exist in the first place there is no need to
Andreas Huber [Mon, 7 Dec 2009 22:53:27 +0000 (14:53 -0800)]
am
5d676ad5: am
52f410e2: Merge change Ifef6435a into eclair-mr2
Merge commit '
5d676ad5d94c3d4f831c2084012f955fe56a8af8'
* commit '
5d676ad5d94c3d4f831c2084012f955fe56a8af8':
Enable proper cleanup of OMX nodes managed through stagefright.
Christopher Tate [Mon, 7 Dec 2009 22:52:56 +0000 (14:52 -0800)]
am
a26b0a40: am
ed6dd2e6: am
d3bc1994: Merge change I397b6a93 into eclair
Merge commit '
a26b0a401b6aadb45fa58d1d05b3112fbfda3fba'
* commit '
a26b0a401b6aadb45fa58d1d05b3112fbfda3fba':
Don't accidentally signal multiple exceptions in setThreadPriority()
Evan Millar [Mon, 7 Dec 2009 22:45:43 +0000 (14:45 -0800)]
am
b5eb3902: Merge change Ie70845ca into eclair-mr2
Merge commit '
b5eb3902ff92f895328928c6a8e05c90104e0c13' into eclair-mr2-plus-aosp
* commit '
b5eb3902ff92f895328928c6a8e05c90104e0c13':
Add Sets#newSortedSet()
Android (Google) Code Review [Mon, 7 Dec 2009 22:41:49 +0000 (14:41 -0800)]
Merge change Ie70845ca into eclair-mr2
* changes:
Add Sets#newSortedSet()
Vasu Nori [Mon, 7 Dec 2009 22:38:35 +0000 (14:38 -0800)]
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit
6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
Andreas Huber [Mon, 7 Dec 2009 22:36:01 +0000 (14:36 -0800)]
am
247003be: Merge change I250f2433 into eclair-mr2
Merge commit '
247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp
* commit '
247003be9ea69928e35ce2f1bd1fab652920a3f2':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Android (Google) Code Review [Mon, 7 Dec 2009 22:31:46 +0000 (14:31 -0800)]
Merge change I250f2433 into eclair-mr2
* changes:
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Fred Quintana [Mon, 7 Dec 2009 22:23:33 +0000 (14:23 -0800)]
remove an old STOPSHIP comment
Andreas Huber [Mon, 7 Dec 2009 22:22:35 +0000 (14:22 -0800)]
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Evan Millar [Mon, 7 Dec 2009 22:01:33 +0000 (14:01 -0800)]
Add Sets#newSortedSet()
Robert Greenwalt [Mon, 7 Dec 2009 19:33:18 +0000 (11:33 -0800)]
Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.
bug:
2265222
Doug Zongker [Mon, 7 Dec 2009 22:12:02 +0000 (14:12 -0800)]
resolved conflicts for merge of
5a2fdbba to master
Leon Scroggins [Mon, 7 Dec 2009 21:40:59 +0000 (13:40 -0800)]
am
6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '
6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp
* commit '
6761e85d41dedf4e783217922a5fedac2b7a654d':
Set InputType of WebTextView according to <input> field's type.
Grace Kloba [Mon, 7 Dec 2009 21:40:53 +0000 (13:40 -0800)]
am
ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '
ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp
* commit '
ddcea3d21645bb3037703c84807dae077aae62ce':
Expose onReceivedSslError() so that the WebView client
Android (Google) Code Review [Mon, 7 Dec 2009 21:39:22 +0000 (13:39 -0800)]
Merge change Idff5eb2a into eclair-mr2
* changes:
Set InputType of WebTextView according to <input> field's type.
Leon Scroggins [Mon, 7 Dec 2009 18:38:07 +0000 (13:38 -0500)]
Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=
2150538 and http://b/issue?id=
1890360
Use the <input type> information to set the InputType, so that
the IME can show the correct options. Also consolidate setup
of WebTextView into setType().
Requires a change in external/webkit.
Grace Kloba [Fri, 4 Dec 2009 03:12:49 +0000 (19:12 -0800)]
Expose onReceivedSslError() so that the WebView client
can accept the error and continue.
Fix http://b/issue?id=
2299152
Grace Kloba [Mon, 7 Dec 2009 21:09:49 +0000 (13:09 -0800)]
am
14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '
14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp
* commit '
14467eb2eea119b4d71dd7dd149479aa092e6de2':
Add "res" support for WebView.
Android (Google) Code Review [Mon, 7 Dec 2009 21:05:46 +0000 (13:05 -0800)]
Merge change I234162b0 into eclair-mr2
* changes:
Add "res" support for WebView.
Dave Sparks [Mon, 7 Dec 2009 21:04:56 +0000 (13:04 -0800)]
am
62679112: Merge change I3c256cf3 into eclair-mr2
Merge commit '
62679112a2ac98f6b73e9a5f6e92b3cb5728703c' into eclair-mr2-plus-aosp
* commit '
62679112a2ac98f6b73e9a5f6e92b3cb5728703c':
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Mon, 7 Dec 2009 21:04:51 +0000 (13:04 -0800)]
am
ffacbc34: am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp
* commit '
ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 21:02:56 +0000 (13:02 -0800)]
Merge change I3c256cf3 into eclair-mr2
* changes:
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Dave Sparks [Mon, 7 Dec 2009 21:01:01 +0000 (13:01 -0800)]
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Mon, 7 Dec 2009 21:00:25 +0000 (13:00 -0800)]
am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2
* commit '
fd2f6358321e95d661f24ba4e08327268035aa59':
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 20:55:38 +0000 (12:55 -0800)]
Merge change I771bebb9 into eclair
* changes:
Add Java exceptions to catch RS calls with no context or no surface.
Daniel Sandler [Mon, 7 Dec 2009 20:51:01 +0000 (12:51 -0800)]
am
1b15acf7: Merge change I21eb4b87 into eclair-mr2
Merge commit '
1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp
* commit '
1b15acf705a6bcca333b1e8a6a48039242cc7d57':
Allow room for descenders in am/pm text.
Dave Sparks [Mon, 7 Dec 2009 20:50:55 +0000 (12:50 -0800)]
am
9d5b7aca: Merge change Ic0e3ddf8 into eclair-mr2
Merge commit '
9d5b7aca742f44e4b16db66a4a372eb71325470f' into eclair-mr2-plus-aosp
* commit '
9d5b7aca742f44e4b16db66a4a372eb71325470f':
Remove unused Java object reference in native SoundPool code.
Android (Google) Code Review [Mon, 7 Dec 2009 20:46:56 +0000 (12:46 -0800)]
Merge change I21eb4b87 into eclair-mr2
* changes:
Allow room for descenders in am/pm text.
Android (Google) Code Review [Mon, 7 Dec 2009 20:40:17 +0000 (12:40 -0800)]
Merge change Ic0e3ddf8 into eclair-mr2
* changes:
Remove unused Java object reference in native SoundPool code.
Jason Sams [Mon, 7 Dec 2009 20:40:12 +0000 (12:40 -0800)]
Add Java exceptions to catch RS calls with no context or no surface.
OSDN Git Service
