OSDN Git Service
Andreas Huber [Thu, 13 May 2010 18:16:43 +0000 (11:16 -0700)]
am
3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp
* commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
The Android Open Source Project [Thu, 13 May 2010 16:04:45 +0000 (09:04 -0700)]
merge from open-source master
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
Costin Manolache [Thu, 13 May 2010 02:06:39 +0000 (19:06 -0700)]
am
8ea9f130: Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Merge commit '
8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '
8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug
2680071: Rename the Cloud to Device
Costin Manolache [Thu, 13 May 2010 02:04:27 +0000 (19:04 -0700)]
Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Costin Manolache [Wed, 12 May 2010 23:04:10 +0000 (16:04 -0700)]
Bug
2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
Scott Main [Wed, 12 May 2010 22:33:38 +0000 (15:33 -0700)]
am
38b523af: Merge "docs: add missing path-permissions document" into froyo
Merge commit '
38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp
* commit '
38b523af5c233dd5f8631ada2cd80b2d75b0efde':
docs: add missing path-permissions document
Scott Main [Wed, 12 May 2010 22:33:35 +0000 (15:33 -0700)]
am
f0e4ae56: Merge "docs: fix broken links" into froyo
Merge commit '
f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp
* commit '
f0e4ae563228db584041d517672aeadacecba61f':
docs: fix broken links
Grace Kloba [Wed, 12 May 2010 22:33:30 +0000 (15:33 -0700)]
am
336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
Merge commit '
336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '
336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
Scott Main [Wed, 12 May 2010 22:01:30 +0000 (15:01 -0700)]
Merge "docs: add missing path-permissions document" into froyo
The Android Open Source Project [Wed, 12 May 2010 21:54:38 +0000 (14:54 -0700)]
merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
Scott Main [Wed, 12 May 2010 21:53:35 +0000 (14:53 -0700)]
Merge "docs: fix broken links" into froyo
The Android Open Source Project [Wed, 12 May 2010 21:53:25 +0000 (14:53 -0700)]
merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
The Android Open Source Project [Wed, 12 May 2010 21:39:38 +0000 (14:39 -0700)]
merge from open-source master
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
The Android Open Source Project [Wed, 12 May 2010 21:10:23 +0000 (14:10 -0700)]
merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
The Android Open Source Project [Wed, 12 May 2010 19:33:35 +0000 (12:33 -0700)]
merge from open-source master
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
The Android Open Source Project [Wed, 12 May 2010 18:58:14 +0000 (11:58 -0700)]
merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
Dirk Dougherty [Wed, 12 May 2010 18:08:46 +0000 (11:08 -0700)]
am
a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Merge commit '
a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit '
a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
Dirk Dougherty [Wed, 12 May 2010 18:05:03 +0000 (11:05 -0700)]
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Scott Main [Wed, 12 May 2010 14:50:59 +0000 (07:50 -0700)]
am
18dc51d4: Merge "docs: fix broken anchor names" into froyo
Merge commit '
18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp
* commit '
18dc51d4137c5cf8364541e25ad9ded203342c6b':
docs: fix broken anchor names
Dirk Dougherty [Wed, 12 May 2010 14:50:57 +0000 (07:50 -0700)]
am
0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Merge commit '
0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp
* commit '
0d1b0814be24f501395bf175fba8691117f782d5':
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Dirk Dougherty [Wed, 12 May 2010 14:50:53 +0000 (07:50 -0700)]
am
4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
Merge commit '
4d5275e723221df67aad00a440dd6a2e9a22caae' into froyo-plus-aosp
* commit '
4d5275e723221df67aad00a440dd6a2e9a22caae':
Doc change: update diff report 7-> 8
Scott Main [Wed, 12 May 2010 14:50:48 +0000 (07:50 -0700)]
am
827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Merge commit '
827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp
* commit '
827a50dda4c1900ab5333f8c2d3705796ff4649d':
docs: remove the dashboard from the sidenav for the offline docs
Brett Chabot [Wed, 12 May 2010 14:50:44 +0000 (07:50 -0700)]
am
b4c9a8f6: Merge "Fix imf tests." into froyo
Merge commit '
b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp
* commit '
b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
Fix imf tests.
Scott Main [Wed, 12 May 2010 14:50:41 +0000 (07:50 -0700)]
am
bb129dc5: docs: make Notifying the User an expandable list
Merge commit '
bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp
* commit '
bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
docs: make Notifying the User an expandable list
Scott Main [Wed, 12 May 2010 14:50:36 +0000 (07:50 -0700)]
am
a225e3b1: docs: add quickview box with "see also" links for some articles
Merge commit '
a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp
* commit '
a225e3b1cd02da0f748f1a8e7341c727eff28085':
docs: add quickview box with "see also" links for some articles
Scott Main [Wed, 12 May 2010 14:50:30 +0000 (07:50 -0700)]
am
6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
Merge commit '
6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp
* commit '
6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
docs: remove allowBackup attribute from documentation
Xavier Ducrohet [Wed, 12 May 2010 14:50:19 +0000 (07:50 -0700)]
am
b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit '
b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp
* commit '
b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
Marco Nelissen [Wed, 12 May 2010 14:50:14 +0000 (07:50 -0700)]
am
836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug
2671792." into froyo
Merge commit '
836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '
836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
Dianne Hackborn [Wed, 12 May 2010 14:50:09 +0000 (07:50 -0700)]
am
037cd341: Merge "Fix issue #
2676378: Activity Manager Crash on FRF40" into froyo
Merge commit '
037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp
* commit '
037cd3413a925c6f449050096a7cd4aab3207612':
Fix issue #
2676378: Activity Manager Crash on FRF40
Scott Main [Wed, 12 May 2010 14:50:02 +0000 (07:50 -0700)]
am
5cdf5fdc: docs: add document about app install location
Merge commit '
5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp
* commit '
5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
docs: add document about app install location
Dirk Dougherty [Wed, 12 May 2010 14:49:57 +0000 (07:49 -0700)]
am
8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
Merge commit '
8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp
* commit '
8acb68e9aae7f6766b88440ede6598da63db9fdd':
Doc Change: Docs for NDK r4.
Scott Main [Wed, 12 May 2010 14:49:51 +0000 (07:49 -0700)]
am
c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
Merge commit '
c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp
* commit '
c80b95a85ae31eba80870cb3416fd2c25821c056':
docs: announce froyo and update IO message
Mike Lockwood [Wed, 12 May 2010 14:49:45 +0000 (07:49 -0700)]
am
e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit '
e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit '
e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Andreas Huber [Wed, 12 May 2010 14:49:39 +0000 (07:49 -0700)]
am
e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Merge commit '
e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit '
e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
Andreas Huber [Wed, 12 May 2010 14:49:31 +0000 (07:49 -0700)]
am
d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
Merge commit '
d6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp
* commit '
d6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Costin Manolache [Wed, 12 May 2010 14:49:16 +0000 (07:49 -0700)]
am
e2055fe4: Merge "Bug
2673557: rename datamessaging" into froyo
Merge commit '
e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit '
e2055fe4258f8085a88328579c852ec26d77bb10':
Bug
2673557: rename datamessaging
Jean-Michel Trivi [Wed, 12 May 2010 14:49:10 +0000 (07:49 -0700)]
am
3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
Merge commit '
3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '
3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
Dirk Dougherty [Wed, 12 May 2010 14:49:00 +0000 (07:49 -0700)]
am
fe089334: Merge "Doc Change: cherry-pick from ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
Merge commit '
fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp
* commit '
fe08933450f4be42c9b3eac900c64f23857ecd17':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
Jean-Michel Trivi [Wed, 12 May 2010 14:48:50 +0000 (07:48 -0700)]
am
aaa01b18: Merge " Fix bug
2670395 and
2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
Merge commit '
aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp
* commit '
aaa01b181c0eea4ff6496d446e25e499b12ca14c':
Fix bug
2670395 and
2599698
Wu-cheng Li [Wed, 12 May 2010 14:48:41 +0000 (07:48 -0700)]
am
78624e41: Add remove method in CameraParameters class.
Merge commit '
78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp
* commit '
78624e41da166712aaa5ae47e4d3467337ac810a':
Add remove method in CameraParameters class.
Scott Main [Wed, 12 May 2010 03:13:26 +0000 (20:13 -0700)]
Merge "docs: fix broken anchor names" into froyo
Dirk Dougherty [Wed, 12 May 2010 02:53:04 +0000 (19:53 -0700)]
Merge "Doc change: update diff report 7-> 8" into froyo
Scott Main [Wed, 12 May 2010 02:25:19 +0000 (19:25 -0700)]
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Brett Chabot [Wed, 12 May 2010 02:17:04 +0000 (19:17 -0700)]
Merge "Fix imf tests." into froyo
Scott Main [Tue, 11 May 2010 22:25:38 +0000 (15:25 -0700)]
Merge "docs: remove allowBackup attribute from documentation" into froyo
Xavier Ducrohet [Tue, 11 May 2010 21:48:48 +0000 (14:48 -0700)]
Merge "Hide two audio focus methods." into froyo
Marco Nelissen [Tue, 11 May 2010 21:36:16 +0000 (14:36 -0700)]
Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug
2671792." into froyo
Dianne Hackborn [Tue, 11 May 2010 21:26:43 +0000 (14:26 -0700)]
Merge "Fix issue #
2676378: Activity Manager Crash on FRF40" into froyo
Dirk Dougherty [Tue, 11 May 2010 21:20:24 +0000 (14:20 -0700)]
Merge "Doc Change: Docs for NDK r4." into froyo
Scott Main [Tue, 11 May 2010 21:04:49 +0000 (14:04 -0700)]
Merge "docs: announce froyo and update IO message" into froyo
Mike Lockwood [Tue, 11 May 2010 20:26:25 +0000 (13:26 -0700)]
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Andreas Huber [Tue, 11 May 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Andreas Huber [Tue, 11 May 2010 19:20:55 +0000 (12:20 -0700)]
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
Dianne Hackborn [Tue, 11 May 2010 19:07:32 +0000 (12:07 -0700)]
Merge "Corrected repeat count for key repeat in input device."
Costin Manolache [Tue, 11 May 2010 18:42:58 +0000 (11:42 -0700)]
Merge "Bug
2673557: rename datamessaging" into froyo
Jean-Michel Trivi [Tue, 11 May 2010 18:40:21 +0000 (11:40 -0700)]
Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
Dirk Dougherty [Tue, 11 May 2010 18:33:13 +0000 (11:33 -0700)]
Merge "Doc Change: cherry-pick from ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
Keith Ito [Tue, 11 May 2010 17:19:06 +0000 (10:19 -0700)]
am
be65399b: Merge "Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit '
be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp
* commit '
be65399baf23855094596e27c25763ff92e9e027':
Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Nicolas Roard [Tue, 11 May 2010 17:18:59 +0000 (10:18 -0700)]
am
f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)
Merge commit '
f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit '
f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
Dianne Hackborn [Tue, 11 May 2010 17:18:55 +0000 (10:18 -0700)]
am
6d00151c: Merge "Hopefully fix issue #
2662536: Why is launcher being killed?" into froyo
Merge commit '
6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '
6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #
2662536: Why is launcher being killed?
Dirk Dougherty [Tue, 11 May 2010 17:18:51 +0000 (10:18 -0700)]
am
1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '
1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp
* commit '
1926c471a3acde38931f2cbd55415decc9879d2d':
Doc change: Final api diffs 7 -> 8.
Dirk Dougherty [Tue, 11 May 2010 17:18:47 +0000 (10:18 -0700)]
am
b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
Merge commit '
b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp
* commit '
b32c2402c2b9d58b4f74be62dac6ce2781caec05':
Doc change: add toc references to tictactoe sample apps and screen shots.
Jim Miller [Tue, 11 May 2010 17:18:38 +0000 (10:18 -0700)]
am
a2757901: Merge "Fix
2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit '
a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit '
a27579016caf1438400a3637e3896bec653e3756':
Fix
2660488: Add LockScreen/InCallScreen resources to preloads
Jean-Michel Trivi [Tue, 11 May 2010 16:42:41 +0000 (09:42 -0700)]
Merge " Fix bug
2670395 and
2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug
2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called." into froyo
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."
Keith Ito [Tue, 11 May 2010 03:41:47 +0000 (20:41 -0700)]
Merge "Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
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."
Costin Manolache [Mon, 10 May 2010 23:42:25 +0000 (16:42 -0700)]
Bug
2673557: rename datamessaging
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
Dianne Hackborn [Tue, 11 May 2010 00:27:14 +0000 (17:27 -0700)]
Merge "Hopefully fix issue #
2662536: Why is launcher being killed?" into froyo
Dirk Dougherty [Mon, 10 May 2010 23:23:13 +0000 (16:23 -0700)]
Merge "Doc change: Final api diffs 7 -> 8." into froyo
Jim Miller [Mon, 10 May 2010 22:55:41 +0000 (15:55 -0700)]
Merge "Fix
2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
The Android Open Source Project [Mon, 10 May 2010 20:48:37 +0000 (13:48 -0700)]
merge from open-source master
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
The Android Open Source Project [Mon, 10 May 2010 19:37:10 +0000 (12:37 -0700)]
merge from open-source master
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
Jean-Baptiste Queru [Mon, 10 May 2010 18:14:01 +0000 (11:14 -0700)]
Merge "Include the API level 4 fields in the Parcel."
Robert Greenwalt [Mon, 10 May 2010 17:12:58 +0000 (10:12 -0700)]
am
b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit '
b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp
* commit '
b74a239fd2e729c41b0cb87cbc606530ed631a41':
String change to refer to wifi tether as hotspot
Robert Greenwalt [Mon, 10 May 2010 17:11:12 +0000 (10:11 -0700)]
Merge "String change to refer to wifi tether as hotspot" into froyo
Scott Main [Mon, 10 May 2010 16:56:43 +0000 (09:56 -0700)]
am
62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '
62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp
* commit '
62c28caee4a26e106134264f917bacef77438483':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
Scott Main [Mon, 10 May 2010 16:54:30 +0000 (09:54 -0700)]
Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Dan Egnor [Mon, 10 May 2010 16:43:53 +0000 (09:43 -0700)]
am
7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '
7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp
* commit '
7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
Add unit test for passing thread priority & cgroup through Binder.
Dirk Dougherty [Mon, 10 May 2010 16:43:50 +0000 (09:43 -0700)]
am
fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp
* commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Scott Main [Mon, 10 May 2010 16:43:47 +0000 (09:43 -0700)]
am
c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit '
c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp
* commit '
c4c42eef9a62846a152094d61987e6dd2728e417':
docs: add default value and compatibility info for installLocation
Scott Main [Mon, 10 May 2010 16:43:35 +0000 (09:43 -0700)]
am
c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp
* commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420':
docs: revisions to the new resources doc based on editorial feedback
Andreas Huber [Mon, 10 May 2010 16:43:26 +0000 (09:43 -0700)]
am
d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '
d13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp
* commit '
d13efb20089e44e6958cb9704864c03821f19e1c':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Mathias Agopian [Mon, 10 May 2010 16:43:23 +0000 (09:43 -0700)]
am
c69775d6: Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '
c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp
* commit '
c69775d616c25d31dcea119ab1e7af19148853e2':
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
Dirk Dougherty [Mon, 10 May 2010 16:43:03 +0000 (09:43 -0700)]
am
0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '
0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp
* commit '
0dd3a239519369933d4efa701479c816b4b33874':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Jean-Baptiste Queru [Mon, 10 May 2010 15:55:17 +0000 (08:55 -0700)]
Merge "long modifier was on the wrong argument."
Dan Egnor [Sun, 9 May 2010 14:03:46 +0000 (07:03 -0700)]
Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Dirk Dougherty [Sat, 8 May 2010 04:07:57 +0000 (21:07 -0700)]
Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Andreas Huber [Fri, 7 May 2010 20:47:42 +0000 (13:47 -0700)]
Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Mathias Agopian [Fri, 7 May 2010 20:39:29 +0000 (13:39 -0700)]
Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Jean-Baptiste Queru [Fri, 7 May 2010 19:57:02 +0000 (12:57 -0700)]
Merge "Added WEB_URL_PATTERN for Montenegro ".me""
Dirk Dougherty [Fri, 7 May 2010 17:57:48 +0000 (10:57 -0700)]
Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Brian Carlstrom [Fri, 7 May 2010 17:23:34 +0000 (10:23 -0700)]
am
e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp
* commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Joe Malin [Fri, 7 May 2010 15:54:53 +0000 (08:54 -0700)]
am
e50b940f: Doc Change: cherry-pick doc change from -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '
e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp
* commit '
e50b940f153070a631a6c0d426cb7f3207042659':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Bjorn Bringert [Fri, 7 May 2010 10:40:31 +0000 (03:40 -0700)]
am
75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '
75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp
* commit '
75370e74629b4938c4472d6001eebf5e305dbc55':
Fixing: RecognitionService logcat spam "cancel called..."
Bjorn Bringert [Fri, 7 May 2010 10:37:48 +0000 (03:37 -0700)]
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Mathias Agopian [Fri, 7 May 2010 03:21:45 +0000 (20:21 -0700)]
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).
in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.
Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
Dan Egnor [Fri, 7 May 2010 00:33:45 +0000 (17:33 -0700)]
am
8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '
8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '
8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.