OSDN Git Service
Eric Laurent [Wed, 12 May 2010 15:24:18 +0000 (08:24 -0700)]
Several fixes in AudioDumpInterface:
- forward setMode() and getInputBufferSize() calls to underlying audio hardware interface.
- Allow capture of more than one output stream (previous implementation was only capturing
the first output opened, namely the hardware output).
- Allow capture of input streams: previous implementation was only simulating input streams
when more than one was open at a time by reading from a file on SD card). Now the default
behavior is to capture PCM data read from input stream if it was successfully opened or
simulate capture otherwise.
Change-Id: I7e2892b25e295fc3c19c7eb0f71bfaea5816b73a
Jamie Gennis [Tue, 11 May 2010 19:25:31 +0000 (12:25 -0700)]
Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken
Keith Ito [Tue, 11 May 2010 17:24:03 +0000 (10:24 -0700)]
am
a8d8cb12: am
be65399b: Merge "Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit '
a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit '
a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Nicolas Roard [Tue, 11 May 2010 17:24:00 +0000 (10:24 -0700)]
am
373b4913: 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 '
373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '
373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
Dianne Hackborn [Tue, 11 May 2010 17:23:56 +0000 (10:23 -0700)]
am
7e76b6d1: am
6d00151c: Merge "Hopefully fix issue #
2662536: Why is launcher being killed?" into froyo
Merge commit '
7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '
7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #
2662536: Why is launcher being killed?
Dirk Dougherty [Tue, 11 May 2010 17:23:52 +0000 (10:23 -0700)]
am
02168c41: am
1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '
02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken
* commit '
02168c41c444e4f601a2809d6d948e4b051b3a3e':
Doc change: Final api diffs 7 -> 8.
Dirk Dougherty [Tue, 11 May 2010 17:23:48 +0000 (10:23 -0700)]
am
769612e1: am
b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
Merge commit '
769612e160c9be01c96371412e12d367e5063e9f' into kraken
* commit '
769612e160c9be01c96371412e12d367e5063e9f':
Doc change: add toc references to tictactoe sample apps and screen shots.
Jim Miller [Tue, 11 May 2010 17:23:42 +0000 (10:23 -0700)]
am
4d89954d: am
a2757901: Merge "Fix
2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit '
4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '
4d89954dc4572a05339dc7a95ec683892558162b':
Fix
2660488: Add LockScreen/InCallScreen resources to preloads
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
Keith Ito [Tue, 11 May 2010 03:41:47 +0000 (20:41 -0700)]
Merge "Fix for bug
2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Wu-cheng Li [Tue, 11 May 2010 03:04:14 +0000 (20:04 -0700)]
Merge "Add continuous focus mode constant." into kraken
Jamie Gennis [Tue, 11 May 2010 00:33:32 +0000 (17:33 -0700)]
Add incStrong and decStrong methods to android_native_{window,buffer}_t.
This change adds the methods necessary to use sp<> to handle refcounting
android_native_window_t and android_native_buffer_t. The new methods forward
the refcounting operations to the corresponding android_native_base_t
functions.
Change-Id: I7de8e262728e439bc1efdf69374a2a9f6f432ced
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:50:32 +0000 (13:50 -0700)]
am
b6f0cbdc: merge from open-source master
Merge commit '
b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken
* commit '
b6f0cbdcbb566368ebe0468f61de024f644db6e1':
Include the API level 4 fields in the Parcel.
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:53:28 +0000 (12:53 -0700)]
am
686d9ff5: merge from open-source master
Merge commit '
686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken
* commit '
686d9ff53c32ded9b2b02eb9f2040f2030846e51':
Use isLocationProviderEnabled to test for enabled providers
Added WEB_URL_PATTERN for Montenegro ".me"
long modifier was on the wrong argument.
The Android Open Source Project [Mon, 10 May 2010 19:37:10 +0000 (12:37 -0700)]
merge from open-source master
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
James Dong [Mon, 10 May 2010 18:33:25 +0000 (11:33 -0700)]
Merge "Metadata construction optimization" into kraken
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:14:51 +0000 (10:14 -0700)]
am
c8d1556f: am
b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit '
c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken
* commit '
c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
String change to refer to wifi tether as hotspot
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:58:30 +0000 (09:58 -0700)]
am
717e135c: am
62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '
717e135c17239ff3dd0698eb82b26f8e8ade0d08' into kraken
* commit '
717e135c17239ff3dd0698eb82b26f8e8ade0d08':
docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
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:49:41 +0000 (09:49 -0700)]
am
5610c287: am
7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '
5610c2871b5a8abab081c9e209925e2f0f2e3966' into kraken
* commit '
5610c2871b5a8abab081c9e209925e2f0f2e3966':
Add unit test for passing thread priority & cgroup through Binder.
Dirk Dougherty [Mon, 10 May 2010 16:49:37 +0000 (09:49 -0700)]
am
e4682e8a: am
fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit '
e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken
* commit '
e4682e8ae75d573c12ddabce13b8b5c39011a86f':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Scott Main [Mon, 10 May 2010 16:49:34 +0000 (09:49 -0700)]
am
fe5921aa: am
c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit '
fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken
* commit '
fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
docs: add default value and compatibility info for installLocation
Scott Main [Mon, 10 May 2010 16:49:30 +0000 (09:49 -0700)]
am
d2f2a80e: 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 '
d2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken
* commit '
d2f2a80e9ff7f0b2229d921f24682d984e3b5673':
docs: revisions to the new resources doc based on editorial feedback
Andreas Huber [Mon, 10 May 2010 16:49:24 +0000 (09:49 -0700)]
am
17078510: am
d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '
1707851090e6512a77247b0c260dd673ef687589' into kraken
* commit '
1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Mathias Agopian [Mon, 10 May 2010 16:49:19 +0000 (09:49 -0700)]
am
56aed6bd: am
c69775d6: Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '
56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken
* commit '
56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
Dirk Dougherty [Mon, 10 May 2010 16:49:13 +0000 (09:49 -0700)]
am
aff856d0: am
0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '
aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken
* commit '
aff856d053ba239114e7f16d3cdd240a6d973f2f':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
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."
Chih-Chung Chang [Mon, 10 May 2010 07:04:40 +0000 (15:04 +0800)]
Force sooner/generic/sim to use camera stub only.
Change-Id: Ie3251e3801cd09b3f373bbd4afb5fda82a0c5818
Chih-Chung Chang [Mon, 10 May 2010 06:36:24 +0000 (14:36 +0800)]
Fix for build without a hardware camera.
Change-Id: Ib5a0b58ea9e02ae1df9d258de541726189147567
Chih-Chung Chang [Thu, 6 May 2010 08:36:58 +0000 (16:36 +0800)]
Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
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:25:41 +0000 (10:25 -0700)]
am
e34d31e6: am
e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit '
e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken
* commit '
e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
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:58:42 +0000 (08:58 -0700)]
am
9609cdc8: am
e50b940f: Doc Change: cherry-pick doc change from -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '
9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken
* commit '
9609cdc8522414b61ffb7d31b4ceb2007f205129':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
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:43:48 +0000 (03:43 -0700)]
am
c8170ee2: am
75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '
c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken
* commit '
c8170ee2055dcaf993391aacef0e54d87561bfdb':
Fixing: RecognitionService logcat spam "cancel called..."
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:35:06 +0000 (17:35 -0700)]
am
ca48c88c: am
8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '
ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f' into kraken
* commit '
ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f':
Make static versions of libutils and libbinder.
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.
Dan Egnor [Fri, 7 May 2010 00:31:48 +0000 (17:31 -0700)]
Merge "Make static versions of libutils and libbinder." into froyo
Daniel Sandler [Fri, 7 May 2010 00:29:53 +0000 (17:29 -0700)]
am
ad2f9ff7: (-s ours) am
08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '
ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken
* commit '
ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd':
Fix "p.m." in lockscreen (locale: es).
Daniel Sandler [Fri, 7 May 2010 00:24:22 +0000 (17:24 -0700)]
am
08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '
08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp
* commit '
08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
Fix "p.m." in lockscreen (locale: es).
Daniel Sandler [Fri, 7 May 2010 00:23:03 +0000 (17:23 -0700)]
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Robert Greenwalt [Fri, 7 May 2010 00:17:51 +0000 (17:17 -0700)]
am
d6d11517: am
f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit '
d6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken
* commit '
d6d115173a856fe28cf5a3087f6d7b0de77495c5':
Fix ThrottleService wifi interaction
Robert Greenwalt [Fri, 7 May 2010 00:16:04 +0000 (17:16 -0700)]
am
f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit '
f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp
* commit '
f9dc24de53890e0a8289a4349562ed4bd9611974':
Fix ThrottleService wifi interaction
Robert Greenwalt [Fri, 7 May 2010 00:14:23 +0000 (17:14 -0700)]
Merge "Fix ThrottleService wifi interaction" into froyo
Kenny Root [Fri, 7 May 2010 00:12:13 +0000 (17:12 -0700)]
Merge "Prevent local reference table overflows" into kraken
Jim Miller [Thu, 6 May 2010 23:36:23 +0000 (16:36 -0700)]
Merge "Manual integration of I32a7b5 from froyo" into kraken
Xia Wang [Thu, 6 May 2010 23:31:36 +0000 (16:31 -0700)]
am
3e6c1696: am
11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '
3e6c1696135f267cc59d050747839c56ce868ef9' into kraken
* commit '
3e6c1696135f267cc59d050747839c56ce868ef9':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Dan Morrill [Thu, 6 May 2010 23:31:31 +0000 (16:31 -0700)]
am
60b02cab: am
61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '
60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken
* commit '
60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
Adding PacketVideo attribution in NOTICE.
Neal Nguyen [Thu, 6 May 2010 23:31:27 +0000 (16:31 -0700)]
am
ad0830a1: am
639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '
ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken
* commit '
ad0830a136e1a205be42f18c4b779e50c9ac1985':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Xia Wang [Thu, 6 May 2010 23:12:38 +0000 (16:12 -0700)]
am
11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '
11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp
* commit '
11505b474b16457fb65952aadba0609cb33de8e7':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Dan Morrill [Thu, 6 May 2010 23:12:33 +0000 (16:12 -0700)]
am
61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp
* commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57':
Adding PacketVideo attribution in NOTICE.
Neal Nguyen [Thu, 6 May 2010 23:12:22 +0000 (16:12 -0700)]
am
639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '
639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp
* commit '
639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Xia Wang [Thu, 6 May 2010 22:24:08 +0000 (15:24 -0700)]
Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
The Android Open Source Project [Thu, 6 May 2010 22:22:17 +0000 (15:22 -0700)]
am
f4dffd8a: merge from open-source master
Merge commit '
f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken
* commit '
f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
Telephony: Add PUK MMI code support for CDMA RUIM phones
Type Zero Sms should not be displayed/stored/notified.
The Android Open Source Project [Thu, 6 May 2010 22:18:59 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
Dan Morrill [Thu, 6 May 2010 22:11:02 +0000 (15:11 -0700)]
Merge "Adding PacketVideo attribution in NOTICE." into froyo
Dan Morrill [Thu, 6 May 2010 21:15:47 +0000 (14:15 -0700)]
Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
Neal Nguyen [Thu, 6 May 2010 20:45:18 +0000 (13:45 -0700)]
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Andreas Huber [Thu, 6 May 2010 19:43:59 +0000 (12:43 -0700)]
am
71bd9fc8: am
100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '
71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken
* commit '
71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
Dirk Dougherty [Thu, 6 May 2010 19:43:56 +0000 (12:43 -0700)]
am
8b6ac78e: am
5305627d: Doc change: New doc that describes how market filters work
Merge commit '
8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc' into kraken
* commit '
8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc':
Doc change: New doc that describes how market filters work
Dan Bornstein [Thu, 6 May 2010 19:43:52 +0000 (12:43 -0700)]
am
89ad07b0: am
42ee86e6: Merge "For issue #
2651381, allow library prelinking." into froyo
Merge commit '
89ad07b048ff035394596d6a8916f639f3f0b868' into kraken
* commit '
89ad07b048ff035394596d6a8916f639f3f0b868':
For issue #
2651381, allow library prelinking.
Neal Nguyen [Thu, 6 May 2010 19:43:48 +0000 (12:43 -0700)]
am
e96e2358: am
f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit '
e96e235865830e2f0ee54e22feb20f26c3390999' into kraken
* commit '
e96e235865830e2f0ee54e22feb20f26c3390999':
Adding a few host-based stress tests for Apps on SD.
Andreas Huber [Thu, 6 May 2010 19:36:13 +0000 (12:36 -0700)]
am
100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '
100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp
* commit '
100ef9bee48c9beb83d885d233de6a42c64f55af':
Disable vorbis seek when streaming from localhost.
Dirk Dougherty [Thu, 6 May 2010 19:36:10 +0000 (12:36 -0700)]
am
5305627d: Doc change: New doc that describes how market filters work
Merge commit '
5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp
* commit '
5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
Doc change: New doc that describes how market filters work
Dan Bornstein [Thu, 6 May 2010 19:36:05 +0000 (12:36 -0700)]
am
42ee86e6: Merge "For issue #
2651381, allow library prelinking." into froyo
Merge commit '
42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp
* commit '
42ee86e66d972dcdf240e549e5fdc151a144af64':
For issue #
2651381, allow library prelinking.
Neal Nguyen [Thu, 6 May 2010 19:36:01 +0000 (12:36 -0700)]
am
f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit '
f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp
* commit '
f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
Adding a few host-based stress tests for Apps on SD.
Andreas Huber [Thu, 6 May 2010 18:27:35 +0000 (11:27 -0700)]
Merge "Disable vorbis seek when streaming from localhost." into froyo
Dan Bornstein [Thu, 6 May 2010 17:01:39 +0000 (10:01 -0700)]
Merge "For issue #
2651381, allow library prelinking." into froyo
Neal Nguyen [Thu, 6 May 2010 16:44:10 +0000 (09:44 -0700)]
Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Dan Egnor [Thu, 6 May 2010 07:55:09 +0000 (00:55 -0700)]
Make static versions of libutils and libbinder.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so. The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug
2660235.
Bug:
2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
OSDN Git Service
