summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* reserve android.opengl.GLWallpaperService name for future useMathias Agopian2010-08-251-0/+25
| | | | Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
* Merge "Added preset reverb." into gingerbreadEric Laurent2010-08-253-55/+201
|\
| * Added preset reverb.Eric Laurent2010-08-243-55/+201
| | | | | | | | | | | | | | Modified lvm reverb wrapper code to expose a preset reverb interface. Also removed debug log from bundle and reverb wrapper. Change-Id: If9b95d91e25a6ff834decdfdda34b17df9b46967
* | Merge "Ensure that buffering updates eventually hit 100% after we download ↵Andreas Huber2010-08-251-12/+19
|\ \ | | | | | | | | | everything." into gingerbread
| * | Ensure that buffering updates eventually hit 100% after we download everything.Andreas Huber2010-08-251-12/+19
| | | | | | | | | | | | | | | Change-Id: I43bb85b1128fa9c1bc8632970d7101006393bcc8 related-to-bug: 2844095
* | | DO NOT MERGE fix null checkCary Clark2010-08-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check to see if the WebChromeClient is null. Checked into master in change 63008 Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3 http://b/2945171
* | | Merge "Allow sniffers to return a packet of opaque data that the ↵Andreas Huber2010-08-2517-32/+87
|\ \ \ | | | | | | | | | | | | corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread
| * | | Allow sniffers to return a packet of opaque data that the corresponding ↵Andreas Huber2010-08-2517-32/+87
| |/ / | | | | | | | | | | | | | | | | | | extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now. Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a related-to-bug: 2948754
* | | Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" ↵Mathias Agopian2010-08-251-6/+10
|\ \ \ | | | | | | | | | | | | into gingerbread
| * | | don't try to lock a buffer that wasn't allocated with SW usage bitsMathias Agopian2010-08-251-6/+10
| | | | | | | | | | | | | | | | Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
* | | | Merge "Remove "StringTest.java"." into gingerbreadBrian Carlstrom2010-08-252-952/+0
|\ \ \ \
| * | | | Remove "StringTest.java".Brian Carlstrom2010-08-242-952/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only tests stuff that's already better tested in dalvik/libcore, plus private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this is the only caller of. Conflicts: tests/CoreTests/android/core/StringTest.java git cherry-pick -e 935022a99dac5454fc478e221b6392f3ba467009 Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
* | | | | Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbreadBrian Carlstrom2010-08-251-52/+28
|\ \ \ \ \
| * | | | | Update AndroidRuntime with dalvik-dev changesBrian Carlstrom2010-08-241-52/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is the result of three cherry-picks: - Add dalvik.vm.gc.preverify dalvik.vm.gc.postverify properties. git cherry-pick --no-commit 0ef82fcf - Add the property dalvik.vm.gc.verifycardtable to set the -Xgc:-Xgc:verifycardtable option for the vm. git cherry-pick --no-commit 8b4faf54 - Eliminate short JIT debugging properties git cherry-pick --no-commit 57a673fc3db9d84908467ae6d245fd60d4637b2f Change-Id: I5f8002ed1e431344570add02f58e2641c8fae549
* | | | | Merge "Fix the simulator build." into gingerbreadEric Laurent2010-08-251-0/+2
|\ \ \ \ \
| * | | | | Fix the simulator build.Eric Laurent2010-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202. Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
* | | | | | am d5e601c2: reconcile open-source froyo into google variantJean-Baptiste Queru2010-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread * commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9': Make the default backup configuration "disabled; local transport selected"
| * | | | | reconcile open-source froyo into google variantJean-Baptiste Queru2010-08-250-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
| | * | | | | Make the default backup configuration "disabled; local transport selected"Christopher Tate2010-08-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default out of the box, an Android build will have the backup mechanism in its "disabled" state and pointed to the LocalTransport test transport. We do not want retail devices built without the Google backend to have backup enabled out of the box; it would cause them to gradually grind away the cache partition for no good reason. On those devices with this change, developers would need to enable backup manually (possibly using the normal Settings UI; more probably using the 'bmgr' shell tool), but would no longer also have to manually configure the active transport name. Device vendors producing Google-enabled products will simply use resource overlays to configure the default state and transport name for their builds. When building a product that points to the Google backup transport by default, the "def_backup_enabled" boolean resource should still be set to 'false' -- the Google backup disclosure activity supplied by GSF will take care of enabling the backup services if the user opts in to it. (Basically, vendors will never have to overlay the def_backup_enabled resource -- the default value of 'false' is correct for any retail device regardless of whether it can use the Google backup transport.) In the SDK build, the default transport will remain the local one, but the default enable state overridden and set to "true". This is the ideal situation for developers: all aspects of the backup mechanism immediately operative with no manual configuration needed. Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
* | | | | | | Merge "Fix linux 64 build" into gingerbreadBrian Carlstrom2010-08-252-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix linux 64 buildBrian Carlstrom2010-08-242-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
* | | | | | Merge "Avoid allocating buffer every time getThumbnail is called." into ↵Chih-Chung Chang2010-08-251-10/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | Avoid allocating buffer every time getThumbnail is called.Chih-Chung Chang2010-08-251-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
* | | | | | | Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" ↵Hung-ying Tyan2010-08-241-1/+40
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into gingerbread
| * | | | | | SipProfile: add isOutgoingCallAllowed() and new builder constructorHung-ying Tyan2010-08-241-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ced47079fd2b00c7160b152eb4c1d34399e39dc
* | | | | | | Merge "Add support for generated documentation as part of the SDK docs." ↵Rohit Mungee2010-08-241-3/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | into gingerbread
| * | | | | | Add support for generated documentation as part of the SDK docs.Bill Napier2010-08-241-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be done by adding the list of files to include to the ALL_GENERATED_DOCS variable, and then making sure to put your generated output files under $(OUT_DOCS)/gen. Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
* | | | | | Merge "Fix the test breakage in vCard tests." into gingerbreadDaisuke Miyakawa2010-08-245-107/+45
|\ \ \ \ \ \
| * | | | | | Fix the test breakage in vCard tests.Daisuke Miyakawa2010-08-245-107/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make custom resolvers use official MockContentProvider instead of relying on its own. - Fix a test which is found to be broken after the fix above. Bug: 2945326 Change-Id: Ifb14f61771215c103d8825240989eecee73d585a
* | | | | | | am 02e18d4d: Merge "Make the default backup configuration "disabled; local ↵Christopher Tate2010-08-241-1/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transport selected"" into froyo Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread * commit '02e18d4d4eed949da02fd8aa87801858d99b902a': Make the default backup configuration "disabled; local transport selected"
| * | | | | | Merge "Make the default backup configuration "disabled; local transport ↵Christopher Tate2010-08-241-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | selected"" into froyo
| | * | | | | | Make the default backup configuration "disabled; local transport selected"Christopher Tate2010-08-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default out of the box, an Android build will have the backup mechanism in its "disabled" state and pointed to the LocalTransport test transport. We do not want retail devices built without the Google backend to have backup enabled out of the box; it would cause them to gradually grind away the cache partition for no good reason. On those devices with this change, developers would need to enable backup manually (possibly using the normal Settings UI; more probably using the 'bmgr' shell tool), but would no longer also have to manually configure the active transport name. Device vendors producing Google-enabled products will simply use resource overlays to configure the default state and transport name for their builds. When building a product that points to the Google backup transport by default, the "def_backup_enabled" boolean resource should still be set to 'false' -- the Google backup disclosure activity supplied by GSF will take care of enabling the backup services if the user opts in to it. (Basically, vendors will never have to overlay the def_backup_enabled resource -- the default value of 'false' is correct for any retail device regardless of whether it can use the Google backup transport.) In the SDK build, the default transport will remain the local one, but the default enable state overridden and set to "true". This is the ideal situation for developers: all aspects of the backup mechanism immediately operative with no manual configuration needed. Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
* | | | | | | | Merge "Negatively cache settings and proactively slurp settings into cache." ↵Brad Fitzpatrick2010-08-241-12/+170
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | into gingerbread
| * | | | | | | Negatively cache settings and proactively slurp settings into cache.Brad Fitzpatrick2010-08-241-12/+170
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The settings database cache is tiny (or should be tiny) and can be slurped into memory. Once it's in memory and we know we have it all we can avoid going to disk at all for keys not in the cache. This is a big percentage of the StrictMode violations & latency. Change-Id: I649411be0c40d348f58376ccfb3eda059fd69fbc
* | | | | | | Merge "fix [2931513] Add support for setting the orientation of an ↵Mathias Agopian2010-08-2411-37/+212
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ANativeWindow" into gingerbread
| * | | | | | | fix [2931513] Add support for setting the orientation of an ANativeWindowMathias Agopian2010-08-2411-37/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also implement support for cropping. Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
* | | | | | | | Merge "A first shot at proper support for seeking of rtsp streams." into ↵Andreas Huber2010-08-247-59/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | | A first shot at proper support for seeking of rtsp streams.Andreas Huber2010-08-247-59/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9604f2d09feedc0074c0e715be58e719d4483760 related-to-bug: 2556656
* | | | | | | | | Merge "Verify that onPause() calls its superclass." into gingerbreadDianne Hackborn2010-08-241-0/+7
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Verify that onPause() calls its superclass.Dianne Hackborn2010-08-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf48992b4445bfc726ade307aad26f3e9577c5fb
* | | | | | | | | Merge "Fix for an NPE in TextView." into gingerbreadGilles Debunne2010-08-241-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix for an NPE in TextView.Gilles Debunne2010-08-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
* | | | | | | | | | Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-243-27/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Some StrictMode API changes.Brad Fitzpatrick2010-08-243-27/+81
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename setThreadBlockingPolicy to setThreadPolicy (opens the way to using StrictMode for non-blocking-related things in the future?) * add allowThreadDiskWrites() and allowThreadDiskReads() to modify the current policy mask and return the old one. this will allow turning off part of StrictMode during certain regions of code. (for instance, writing to disk in Activity onPause...) Change-Id: Ia1878153713f79299971fdab567fa15b3cb9d56c
* | | | | | | | | | Merge "Fix vCard so that it looks at IM correctly." into gingerbreadDaisuke Miyakawa2010-08-241-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix vCard so that it looks at IM correctly.Daisuke Miyakawa2010-08-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
* | | | | | | | | | | Merge "Make VCardTestsBase public." into gingerbreadDaisuke Miyakawa2010-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make VCardTestsBase public.Daisuke Miyakawa2010-08-231-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f1adc6f0b4263424897609b3cc0855e83906407
* | | | | | | | | Merge "Send all Connectivity broadcasts." into gingerbreadRobert Greenwalt2010-08-241-3/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Send all Connectivity broadcasts.Robert Greenwalt2010-08-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using a flag so new broadcasts replaced old. If people are expecting to see all the broadcasts they sometimes would fail. bug:2892383 Change-Id: I63df17fe8f8c68f59e1ad6297fe93e169b4463b4
generated by cgit v1.1 at 2024-07-13 22:32:21 +0000