OSDN Git Service
Dianne Hackborn [Fri, 23 Apr 2010 22:25:09 +0000 (15:25 -0700)]
am
cdf96f75: am
8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '
cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit '
cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
Dianne Hackborn [Fri, 23 Apr 2010 22:22:55 +0000 (15:22 -0700)]
am
8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Dianne Hackborn [Fri, 23 Apr 2010 22:19:34 +0000 (15:19 -0700)]
Merge "Fix typo when parsing external platform version from Settings." into froyo
Jean-Michel Trivi [Fri, 23 Apr 2010 21:53:09 +0000 (14:53 -0700)]
am
f6adae78: am
47dad8fa: Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '
f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken
* commit '
f6adae7866e893afa05b5838bdd244648a66ac3f':
Fix bug
2619062 Music is routed to Phone speaker, though it is
Jean-Michel Trivi [Fri, 23 Apr 2010 21:50:55 +0000 (14:50 -0700)]
am
47dad8fa: Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp
* commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
Fix bug
2619062 Music is routed to Phone speaker, though it is
Jean-Michel Trivi [Fri, 23 Apr 2010 21:48:10 +0000 (14:48 -0700)]
Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Dianne Hackborn [Fri, 23 Apr 2010 21:28:52 +0000 (14:28 -0700)]
am
994e3990: am
2adec762: Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Merge commit '
994e39908b167fb70883ce6c1146433e0486e86f' into kraken
* commit '
994e39908b167fb70883ce6c1146433e0486e86f':
Fix issue #
2621809: Kill! Kill! Kill!
Neal Nguyen [Fri, 23 Apr 2010 21:28:48 +0000 (14:28 -0700)]
am
27e5a95a: am
5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '
27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken
* commit '
27e5a95afc10faca6314f9b710f07e8f99b3311f':
Re-enabling unit tests for PackageManager/Apps on SD.
Dianne Hackborn [Fri, 23 Apr 2010 21:25:05 +0000 (14:25 -0700)]
am
2adec762: Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Merge commit '
2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp
* commit '
2adec762fbb61c73f612acb7463ba765de1296ad':
Fix issue #
2621809: Kill! Kill! Kill!
Neal Nguyen [Fri, 23 Apr 2010 21:25:01 +0000 (14:25 -0700)]
am
5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '
5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp
* commit '
5fa65082f16741394dcfbe756e3880d5c018dace':
Re-enabling unit tests for PackageManager/Apps on SD.
Dianne Hackborn [Fri, 23 Apr 2010 21:23:39 +0000 (14:23 -0700)]
Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Neal Nguyen [Fri, 23 Apr 2010 21:21:53 +0000 (14:21 -0700)]
Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Robert Greenwalt [Fri, 23 Apr 2010 20:55:05 +0000 (13:55 -0700)]
am
b6c770e4: am
0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '
b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken
* commit '
b6c770e4e387bd73d4e7d4cbad99079b37f59043':
Respond to changes in throttle policy.
Robert Greenwalt [Fri, 23 Apr 2010 20:52:18 +0000 (13:52 -0700)]
am
0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp
* commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68':
Respond to changes in throttle policy.
Robert Greenwalt [Fri, 23 Apr 2010 20:50:03 +0000 (13:50 -0700)]
Merge "Respond to changes in throttle policy." into froyo
Dianne Hackborn [Fri, 23 Apr 2010 20:06:02 +0000 (13:06 -0700)]
am
dc14dc6d: am
bf73bbff: Merge "Some debugging help for issue #
2594388" into froyo
Merge commit '
dc14dc6d60675be688c333bbc60a315d2c658054' into kraken
* commit '
dc14dc6d60675be688c333bbc60a315d2c658054':
Some debugging help for issue #
2594388
Dianne Hackborn [Fri, 23 Apr 2010 20:02:29 +0000 (13:02 -0700)]
am
bf73bbff: Merge "Some debugging help for issue #
2594388" into froyo
Merge commit '
bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp
* commit '
bf73bbffc18f5abb5350fa3a410830c05ad10206':
Some debugging help for issue #
2594388
Dianne Hackborn [Fri, 23 Apr 2010 19:59:47 +0000 (12:59 -0700)]
Merge "Some debugging help for issue #
2594388" into froyo
Robert Greenwalt [Fri, 23 Apr 2010 17:24:24 +0000 (10:24 -0700)]
am
1b5a9c5d: am
251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '
1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken
* commit '
1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
Add a Throttle check shortly after boot.
Robert Greenwalt [Fri, 23 Apr 2010 17:20:37 +0000 (10:20 -0700)]
am
251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '
251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp
* commit '
251ccef0445d4456809bfc41a6344e2dae24f2c3':
Add a Throttle check shortly after boot.
Robert Greenwalt [Fri, 23 Apr 2010 17:17:14 +0000 (10:17 -0700)]
Merge "Add a Throttle check shortly after boot." into froyo
Wei Huang [Thu, 22 Apr 2010 23:41:17 +0000 (16:41 -0700)]
am
9666bbdf: am
7b88af67: Merge "bug #
2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '
9666bbdf1bb96dbf42b88443ad042e63971bfb4a' into kraken
* commit '
9666bbdf1bb96dbf42b88443ad042e63971bfb4a':
bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Wei Huang [Thu, 22 Apr 2010 23:35:56 +0000 (16:35 -0700)]
am
7b88af67: Merge "bug #
2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '
7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp
* commit '
7b88af679a9a3b5737343bb996ef392b76d19e73':
bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Wei Huang [Thu, 22 Apr 2010 23:33:40 +0000 (16:33 -0700)]
Merge "bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo
Dianne Hackborn [Thu, 22 Apr 2010 23:30:01 +0000 (16:30 -0700)]
am
4bcdd6b0: am
90c6aec1: Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '
4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken
* commit '
4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b':
Fix issue #
2619247: Music sometimes stops playing when navigation talks
Dianne Hackborn [Thu, 22 Apr 2010 23:29:56 +0000 (16:29 -0700)]
am
476a57e6: am
9bc0a572: Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Merge commit '
476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken
* commit '
476a57e64a7fa7143e434c1064df1fa87fe4b01a':
Fix issue #
2608292: Fails to launch the video camera preview
Dianne Hackborn [Thu, 22 Apr 2010 23:26:59 +0000 (16:26 -0700)]
am
90c6aec1: Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '
90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp
* commit '
90c6aec10f969acf9b171b82920480fb6aeb007f':
Fix issue #
2619247: Music sometimes stops playing when navigation talks
Dianne Hackborn [Thu, 22 Apr 2010 23:24:08 +0000 (16:24 -0700)]
am
9bc0a572: Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Merge commit '
9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp
* commit '
9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
Fix issue #
2608292: Fails to launch the video camera preview
Dianne Hackborn [Thu, 22 Apr 2010 23:23:44 +0000 (16:23 -0700)]
Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Dianne Hackborn [Thu, 22 Apr 2010 23:20:19 +0000 (16:20 -0700)]
Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Suchi Amalapurapu [Thu, 22 Apr 2010 22:57:34 +0000 (15:57 -0700)]
am
a298d6fd: am
a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit '
a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken
* commit '
a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f':
Fix error code when media is filled up.
Suchi Amalapurapu [Thu, 22 Apr 2010 22:54:37 +0000 (15:54 -0700)]
am
a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit '
a2a568e58d77848471a2f1d9ab6df2cbb2c916d6' into froyo-plus-aosp
* commit '
a2a568e58d77848471a2f1d9ab6df2cbb2c916d6':
Fix error code when media is filled up.
Suchi Amalapurapu [Thu, 22 Apr 2010 22:52:25 +0000 (15:52 -0700)]
Merge "Fix error code when media is filled up." into froyo
Leon Scroggins [Thu, 22 Apr 2010 21:31:49 +0000 (14:31 -0700)]
am
986a0380: am
69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.
Merge commit '
986a038030ab57bd36a6eb630da1773b33dfb30b' into kraken
* commit '
986a038030ab57bd36a6eb630da1773b33dfb30b':
Remove the WebTextView if it is drawing when it shouldn't.
Leon Scroggins [Thu, 22 Apr 2010 21:26:38 +0000 (14:26 -0700)]
am
69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.
Merge commit '
69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp
* commit '
69ec5c22d09690d33f0b87a386de13cc61eb9b42':
Remove the WebTextView if it is drawing when it shouldn't.
Grace Kloba [Thu, 22 Apr 2010 20:25:55 +0000 (13:25 -0700)]
am
627728d2: am
a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Merge commit '
627728d26c81ce7a3ee2f784036cfe0c4e5ef899' into kraken
* commit '
627728d26c81ce7a3ee2f784036cfe0c4e5ef899':
Added the subset of partial content support so that
Christopher Tate [Thu, 22 Apr 2010 20:25:49 +0000 (13:25 -0700)]
am
88bfceae: am
75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo
Merge commit '
88bfceae1ab6de010b49e8c497ed2a363d6fa79a' into kraken
* commit '
88bfceae1ab6de010b49e8c497ed2a363d6fa79a':
SDK: new 'bmgr' docs in the Dev Guide
The Android Open Source Project [Thu, 22 Apr 2010 20:25:14 +0000 (13:25 -0700)]
am
5ebaf106: merge from open-source master
Merge commit '
5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken
* commit '
5ebaf10693725c9dc48219c3c65945b84d74692f':
Fix broken logic in SettingsProvider.parseProviderList.
Robert Greenwalt [Thu, 22 Apr 2010 20:24:37 +0000 (13:24 -0700)]
am
d9b802bd: am
05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '
d9b802bd03d0ef4792bc99289f16f6a05bd1ee95' into kraken
* commit '
d9b802bd03d0ef4792bc99289f16f6a05bd1ee95':
Trim throttle logs.
Grace Kloba [Thu, 22 Apr 2010 20:24:28 +0000 (13:24 -0700)]
am
b42b5a6e: am
2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit '
b42b5a6edb08d198caf567acfc0a318547d8be73' into kraken
* commit '
b42b5a6edb08d198caf567acfc0a318547d8be73':
Post a message to set SurfaceView to be visible when
Grace Kloba [Thu, 22 Apr 2010 20:05:15 +0000 (13:05 -0700)]
am
a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Merge commit '
a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7' into froyo-plus-aosp
* commit '
a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7':
Added the subset of partial content support so that
Grace Kloba [Thu, 22 Apr 2010 20:01:55 +0000 (13:01 -0700)]
Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Christopher Tate [Thu, 22 Apr 2010 19:54:36 +0000 (12:54 -0700)]
am
75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo
Merge commit '
75a537051de4220d32e8aa72348909757fa11e5d' into froyo-plus-aosp
* commit '
75a537051de4220d32e8aa72348909757fa11e5d':
SDK: new 'bmgr' docs in the Dev Guide
Christopher Tate [Thu, 22 Apr 2010 19:51:22 +0000 (12:51 -0700)]
Merge "SDK: new 'bmgr' docs in the Dev Guide" into froyo
The Android Open Source Project [Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)]
merge from open-source master
Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
Robert Greenwalt [Thu, 22 Apr 2010 16:11:35 +0000 (09:11 -0700)]
am
05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '
05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp
* commit '
05fa2144e458dc8f024235ea01b8682055d828bf':
Trim throttle logs.
Robert Greenwalt [Thu, 22 Apr 2010 16:08:25 +0000 (09:08 -0700)]
Merge "Trim throttle logs." into froyo
Grace Kloba [Thu, 22 Apr 2010 15:23:35 +0000 (08:23 -0700)]
am
2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp
* commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
Post a message to set SurfaceView to be visible when
Grace Kloba [Thu, 22 Apr 2010 15:20:23 +0000 (08:20 -0700)]
Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Mathias Agopian [Wed, 21 Apr 2010 00:55:49 +0000 (17:55 -0700)]
more surfaceflinger cleanups
get rid of the "fake rtti" code, and use polymorphism instead.
also simplify how we log SF's state (using polymorphism)
Change-Id: I2bae7c98de4dd207a3e2b00083fa3fde7c467922
Mathias Agopian [Thu, 22 Apr 2010 05:27:22 +0000 (22:27 -0700)]
Merge "better fix for [
2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
Mathias Agopian [Wed, 21 Apr 2010 22:24:11 +0000 (15:24 -0700)]
better fix for [
2420565] Surface.lockCanvas() updates the dirty region too often
Change-Id: I83438b40effd21538f1c74396dc665254b9d5ab6
Kenny Root [Thu, 22 Apr 2010 03:06:51 +0000 (20:06 -0700)]
Merge "Fix broken logic in SettingsProvider.parseProviderList."
Christopher Tate [Thu, 22 Apr 2010 01:19:38 +0000 (18:19 -0700)]
am
7e93aad4: am
36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '
7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken
* commit '
7e93aad42d5f96e4e3a471e49384e1ce794c9411':
Fix security hole in Google backup transport registration
Christopher Tate [Thu, 22 Apr 2010 01:15:44 +0000 (18:15 -0700)]
am
36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '
36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp
* commit '
36fa47139d4621dc4bf8d89caa8650495d901b00':
Fix security hole in Google backup transport registration
Christopher Tate [Thu, 22 Apr 2010 01:10:20 +0000 (18:10 -0700)]
Merge "Fix security hole in Google backup transport registration" into froyo
John Wang [Wed, 21 Apr 2010 21:51:43 +0000 (14:51 -0700)]
am
f77fff4b: am
23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '
f77fff4b4e904486bf25affde713294d40764e15' into kraken
* commit '
f77fff4b4e904486bf25affde713294d40764e15':
Add ILLEGAL_SIM_OR_ME error code.
John Wang [Wed, 21 Apr 2010 21:46:06 +0000 (14:46 -0700)]
am
23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp
* commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb':
Add ILLEGAL_SIM_OR_ME error code.
John Wang [Wed, 21 Apr 2010 21:43:12 +0000 (14:43 -0700)]
Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Joe Onorato [Wed, 21 Apr 2010 18:12:29 +0000 (11:12 -0700)]
am
46fba3b9: am
52e70b25: Add title to recent apps dialog.
Merge commit '
46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken
* commit '
46fba3b9e1bb02aa603ffbb17907f081be0ca873':
Add title to recent apps dialog.
Joe Onorato [Wed, 21 Apr 2010 18:07:43 +0000 (11:07 -0700)]
am
52e70b25: Add title to recent apps dialog.
Merge commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp
* commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
Add title to recent apps dialog.
The Android Open Source Project [Wed, 21 Apr 2010 16:15:15 +0000 (09:15 -0700)]
am
f021d12f: merge from open-source master
Merge commit '
f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken
* commit '
f021d12f6f7116e9275cd3553a349ce5cb8aab14':
Allow META* macros outside of the framework
Fix printing order of phone objects creation
The Android Open Source Project [Wed, 21 Apr 2010 16:10:43 +0000 (09:10 -0700)]
merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
Mathias Agopian [Wed, 21 Apr 2010 05:29:05 +0000 (22:29 -0700)]
am
172673cd: (-s ours) am
83512d4d: DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '
172673cd5b21dee6e175ab67235aa19bc2689868' into kraken
* commit '
172673cd5b21dee6e175ab67235aa19bc2689868':
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Mathias Agopian [Wed, 21 Apr 2010 05:26:45 +0000 (22:26 -0700)]
am
83512d4d: DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp
* commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771':
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Mathias Agopian [Wed, 21 Apr 2010 04:55:40 +0000 (21:55 -0700)]
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
don't use glDrawTexi() anymore
Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
Jeff Brown [Wed, 21 Apr 2010 00:57:29 +0000 (17:57 -0700)]
am
ccc96754: am
22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '
ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken
* commit '
ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
Fix PM crash due to bad array bookkeeping logic.
Jeff Brown [Wed, 21 Apr 2010 00:54:59 +0000 (17:54 -0700)]
am
22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '
22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp
* commit '
22caecda8a24c971972d78a112279c48f242d529':
Fix PM crash due to bad array bookkeeping logic.
Jeff Brown [Wed, 21 Apr 2010 00:53:00 +0000 (17:53 -0700)]
Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Robert Greenwalt [Wed, 21 Apr 2010 00:42:08 +0000 (17:42 -0700)]
am
9127d9a5: am
be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '
9127d9a5fd95d7454a10d44acb79079720f6bb91' into kraken
* commit '
9127d9a5fd95d7454a10d44acb79079720f6bb91':
Move Tethering off the ServerThread.
Robert Greenwalt [Wed, 21 Apr 2010 00:39:38 +0000 (17:39 -0700)]
am
be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '
be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp
* commit '
be34896457bb37b4e263efa87316d2e2420adab3':
Move Tethering off the ServerThread.
Robert Greenwalt [Wed, 21 Apr 2010 00:37:22 +0000 (17:37 -0700)]
Merge "Move Tethering off the ServerThread." into froyo
Andreas Huber [Tue, 20 Apr 2010 23:37:35 +0000 (16:37 -0700)]
am
89e28cbe: am
9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Merge commit '
89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken
* commit '
89e28cbefaff6ae9499032bb446ae7e72e019466':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Andreas Huber [Tue, 20 Apr 2010 23:32:30 +0000 (16:32 -0700)]
am
9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Merge commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp
* commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Andreas Huber [Tue, 20 Apr 2010 23:29:23 +0000 (16:29 -0700)]
Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Mathias Agopian [Tue, 20 Apr 2010 23:28:24 +0000 (16:28 -0700)]
Merge "added setCrop() to android_native_window_t" into kraken
Mathias Agopian [Tue, 20 Apr 2010 23:28:14 +0000 (16:28 -0700)]
Merge "add support for up to 16 buffers per surface" into kraken
Jean-Michel Trivi [Tue, 20 Apr 2010 23:04:08 +0000 (16:04 -0700)]
am
8dc4c790: am
fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clie
Merge commit '
8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken
* commit '
8dc4c790e2c278f8f671c728401ee9458d2d74ab':
Update AudioService to reflect phone state changes with AudioFocus.
Jean-Michel Trivi [Tue, 20 Apr 2010 23:00:58 +0000 (16:00 -0700)]
am
fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re
Merge commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp
* commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5':
Update AudioService to reflect phone state changes with AudioFocus.
Mathias Agopian [Tue, 20 Apr 2010 22:59:57 +0000 (15:59 -0700)]
Merge "clean-up surfaceflinger a bit" into kraken
Mathias Agopian [Tue, 20 Apr 2010 21:51:04 +0000 (14:51 -0700)]
clean-up surfaceflinger a bit
get rid of the glDrawTexi path and use floating points instead of fixed point maths
Change-Id: I3aa9ce2dc082f702160e605a16ba5fe987cdf087
Jean-Michel Trivi [Tue, 20 Apr 2010 22:57:30 +0000 (15:57 -0700)]
Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack." into froyo
Suchi Amalapurapu [Tue, 20 Apr 2010 22:14:41 +0000 (15:14 -0700)]
am
d32f9422: am
0dde41fb: Merge "Fix
2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '
d32f942280cc4390ab853321557eef06292b300e' into kraken
* commit '
d32f942280cc4390ab853321557eef06292b300e':
Fix
2610961
Suchi Amalapurapu [Tue, 20 Apr 2010 22:08:50 +0000 (15:08 -0700)]
am
0dde41fb: Merge "Fix
2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '
0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp
* commit '
0dde41fbe0e36bfe059399c839604267ad0318c1':
Fix
2610961
Suchi Amalapurapu [Tue, 20 Apr 2010 22:04:41 +0000 (15:04 -0700)]
Merge "Fix
2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Andreas Huber [Tue, 20 Apr 2010 21:57:25 +0000 (14:57 -0700)]
am
1e1edb2c: am
25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Merge commit '
1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken
* commit '
1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
Andreas Huber [Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)]
am
25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Merge commit '
25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp
* commit '
25dc5f30b2a8276c5790c7152a801fcd905c7281':
Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
Andreas Huber [Tue, 20 Apr 2010 21:48:45 +0000 (14:48 -0700)]
Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
Jean-Michel Trivi [Tue, 20 Apr 2010 21:48:15 +0000 (14:48 -0700)]
am
0fabf2e8: am
8ccbd4ba: Merge "Fix bug
2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Merge commit '
0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8' into kraken
* commit '
0fabf2e81559106cb4aaf9e8ba45b0bed37d5eb8':
Fix bug
2604132 40s skip after undocking
Jean-Michel Trivi [Tue, 20 Apr 2010 21:45:06 +0000 (14:45 -0700)]
am
8ccbd4ba: Merge "Fix bug
2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Merge commit '
8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee' into froyo-plus-aosp
* commit '
8ccbd4ba6d7f1180284df7aa5735dba48b10d8ee':
Fix bug
2604132 40s skip after undocking
Jean-Michel Trivi [Tue, 20 Apr 2010 21:41:11 +0000 (14:41 -0700)]
Merge "Fix bug
2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
Michael Richardson [Tue, 3 Nov 2009 22:01:28 +0000 (17:01 -0500)]
Allow META* macros outside of the framework
The META* macros are useful outside of the framework
for other systems implementing Binder interfaces, but
they depend upon the android namespace. This includes
the appropriate namespace operations, which should be
sane even in that android namespace.
Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
Mathias Agopian [Fri, 16 Apr 2010 01:48:26 +0000 (18:48 -0700)]
added setCrop() to android_native_window_t
hooked up the new method up to Surface.cpp
the actual crop is not implemented in SF yet
Change-Id: Ic6e313c98fd880f127a051a0ccc71808bd689751
Mathias Agopian [Mon, 5 Apr 2010 23:21:53 +0000 (16:21 -0700)]
add support for up to 16 buffers per surface
also increase the dirtyregion size from 1 to 6 rectangles.
Overall we now need 27KiB process instead of 4KiB
Change-Id: Iebda5565015158f49d9ca8dbcf55e6ad04855be3
Nicolas Roard [Tue, 20 Apr 2010 20:29:11 +0000 (13:29 -0700)]
am
3f5d7b83: am
b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit '
3f5d7b83ee194db39c5f784146e4abc4f6568854' into kraken
* commit '
3f5d7b83ee194db39c5f784146e4abc4f6568854':
Speed up layers rendering when using animations
Nicolas Roard [Tue, 20 Apr 2010 20:26:36 +0000 (13:26 -0700)]
am
b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit '
b876bdb52e7c72ced8e7764946e5beb914f17036' into froyo-plus-aosp
* commit '
b876bdb52e7c72ced8e7764946e5beb914f17036':
Speed up layers rendering when using animations
Nicolas Roard [Tue, 20 Apr 2010 20:22:44 +0000 (13:22 -0700)]
Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Daniel Sandler [Tue, 20 Apr 2010 20:06:57 +0000 (13:06 -0700)]
am
29019cb9: (-s ours) am
c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '
29019cb9773dfc7645c9326725a6ac514020eef7' into kraken
* commit '
29019cb9773dfc7645c9326725a6ac514020eef7':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Daniel Sandler [Tue, 20 Apr 2010 20:01:58 +0000 (13:01 -0700)]
am
c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '
c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp
* commit '
c96307efd2829cdd0fa7c835484f2f89edf7d883':
Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
Daniel Sandler [Tue, 20 Apr 2010 19:57:54 +0000 (12:57 -0700)]
Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo