summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "TransferQueue: use a few extra buffers"Chris Craik2012-11-151-5/+1
| | | | | | | | | bug:7549630 bug:6876502 This reverts commit 923f222d2281bf1faac6221b3fb1298940a6d205. Change-Id: I232a5b5b077dc1046ff2d6272876a5e5b441d42c
*-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ | | | | | | | | | Change-Id: I37ac21819a4935135534567a0e6d2f5732a17f33
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| | |\ | |/ / |/| |
| | * TransferQueue: use a few extra buffersJamie Gennis2012-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | This change is a temporary workaround for a buffer synchronization issue. Bug: 6876502 Change-Id: I030b26818ba7e78037a38dcaddd18782cd086b75
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | |\ | | |_|_|/ | |/| | |
| * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| |\ \ \ \
| | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-030-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-280-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | * | | | Null checkJohn Reck2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6975836 Change-Id: I085e2099d016730ba1fdcce71e0452b2026c9617
| | | | | | | | | | | | | | | | | | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-07-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ am 4045ec3b: am a49c3d24: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4045ec3b231b3b2e9d84dede746eb41f115044b7':
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ am 62c46b3a: (-s ours) Merge "DO NOT MERGE Push everything into an R-Tree" ↵John Reck2012-07-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit '62c46b3a581ad0f41d89a334dfbfe76a456df026': DO NOT MERGE Push everything into an R-Tree
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ am b7c99a42: Fix background tiles drawingChris Craik2012-07-272-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b7c99a422b6cb00661fd3e81cb0608d4b3034124': Fix background tiles drawing
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | | Push everything into an R-TreeJohn Reck2012-07-2610-541/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbfd0b91eb9fab057c2a91d740325b598b2d617a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vertically writing characetrs even if the carrier emoji is available on the ↵Junichi Monma2012-10-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | device. Bug id: b/7354733 Change-Id: I2688cb856664bd57bcef508644039c8a13ee96e1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TransferQueue: use a few extra buffersJamie Gennis2012-10-251-1/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a temporary workaround for a buffer synchronization issue. Bug: 6876502 Change-Id: I030b26818ba7e78037a38dcaddd18782cd086b75
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Ensure AndroidAnimation's copy of its name string is unique" into ↵Chris Craik2012-10-232-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure AndroidAnimation's copy of its name string is uniqueChris Craik2012-10-232-5/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7369890 This avoids cross-thread referencing of this WTF::String Change-Id: I975308d6eb7d9b3d9039f2188cb2697cb3191091
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use full transfer queue size on highEndGfx devicesChris Craik2012-10-221-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7393228 Single tile per frame is too slow Change-Id: Ife93976411a54c43313ab2f80706a1ec125e507a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add src rect ptr null checkChris Craik2012-10-163-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7339156 Also fix compilation issue for USE_RECORDING_CONTEXT = false, a flag used in debugging. Change-Id: I63924c7551c82a10b0c67cbb44b9b8961551decd
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d60f8336: (-s ours) am 66ad15e4: DO NOT MERGE Control access to inherited ↵Selim Gurun2012-10-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods of jsinterface objects * commit 'd60f8336f254dab10ab029b654ff092eba5c3d3b': DO NOT MERGE Control access to inherited methods of jsinterface objects
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 66ad15e4: DO NOT MERGE Control access to inherited methods of jsinterface ↵Selim Gurun2012-10-097-16/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects * commit '66ad15e4f5452b9275777e9284b3369cde8aa306': DO NOT MERGE Control access to inherited methods of jsinterface objects
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Control access to inherited methods of jsinterface objectsSelim Gurun2012-10-087-16/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7073422 Use a flag and annotation for allowing access to inherited methods of jsinterface objects. When flag is false, no annotation is needed. When flag is true, annotation is needed for allowing access to inherited methods. Clean cherry pick of f2d8c5bed31609d7d6e3ae77f33e90ea7f888eb3 Change-Id: I226ef92e75df49293f6543abfcd17895abe76adc
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deep copy animation keyframe namesChris Craik2012-10-081-1/+3
| |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7266561 this makes them safe for cross-thread usage Change-Id: Ib3a49999aa5c3e740127ba684f3d4887e1ad5cb9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent fixed background layers for iframes" into jb-mr1-devChris Craik2012-10-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent fixed background layers for iframesChris Craik2012-10-021-0/+2
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7271856 Path was untested/broken Change-Id: I053cb0255665b57b89524debbad9f78286ba9a37
generated by cgit v1.1 at 2025-05-31 17:03:23 +0000