summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a new class to receive vsync events.Jeff Brown2011-12-055-1/+381
| | | | Change-Id: I4e384336d2813752a6d65fda6a77e86113a4510c
* Refactor ValueAnimator to reduce use of ThreadLocals.Jeff Brown2011-12-051-87/+58
| | | | Change-Id: I494c9cc32e58b77d5f7ea092ee6a0ae4d2d805bb
* am 803caff1: am 003c15d7: Merge "Fix issue #5614559: Registering surface ↵Dianne Hackborn2011-12-053-7/+38
|\ | | | | | | | | | | | | error in..." into ics-mr1 * commit '803caff1dc307a8895e9f3560112f969fa3f6f39': Fix issue #5614559: Registering surface error in...
| * am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." ↵Dianne Hackborn2011-12-053-7/+38
| |\ | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc': Fix issue #5614559: Registering surface error in...
| | * Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1Dianne Hackborn2011-12-053-7/+38
| | |\
| | | * Fix issue #5614559: Registering surface error in...Dianne Hackborn2011-12-033-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...Background Replacement on Stingray This is how I should have done it in the first place. We get the new surface from the window manager, and then just copy it in to the constant Surface object we have for the holder. Change-Id: I537a9e413829a18f689dfb46687014676b27156e
* | | | am 32e914fc: am 277cbe5a: Merge "set System UI visibility based on ↵Michael Kolb2011-12-051-7/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MediaController state" into ics-mr1 * commit '32e914fc0366401b896f34d60119f92f625e6973': set System UI visibility based on MediaController state
| * | | am 277cbe5a: Merge "set System UI visibility based on MediaController state" ↵Michael Kolb2011-12-051-7/+30
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '277cbe5a951840558166020568fb1510285e2594': set System UI visibility based on MediaController state
| | * | Merge "set System UI visibility based on MediaController state" into ics-mr1Michael Kolb2011-12-051-7/+30
| | |\ \ | | | |/ | | |/|
| | | * set System UI visibility based on MediaController stateMichael Kolb2011-12-021-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5494143 still doesn't remove the buttons in dimmed state, but at least dims them correctly Change-Id: Idcfc10616d31f6ccf8cd84b706a17d048bf505a1
* | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
| * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge "Simplify the implementation of AudioPlaybackHandler."Narayan Kamath2011-12-0511-762/+720
|\ \ \ \ \ \
| * | | | | | Simplify the implementation of AudioPlaybackHandler.Narayan Kamath2011-12-0111-762/+720
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now uses a queue of runnables, one per synthesis. Also introduce an abstraction that wraps AudioTrack that implements the blocking semantics that we desire. bug:5680699 Change-Id: I34a1248ff05766a7d9b3002055fb5b24aa9f230b
* | | | | | | Merge "fix an issue where invalidate/transactions could be missed"Mathias Agopian2011-12-042-6/+9
|\ \ \ \ \ \ \
| * | | | | | | fix an issue where invalidate/transactions could be missedMathias Agopian2011-12-032-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84a1fcba1317b2631f5441de7b7ecd12af5ad022
* | | | | | | | Merge "Remove type tests when recycling input events."Jeff Brown2011-12-035-17/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove type tests when recycling input events.Jeff Brown2011-12-035-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c2d5980a763c457a0546bbf601e686c601a4c03
* | | | | | | | | am a91e54fe: am f57c1388: Merge "SurfaceFlinger: fix layer removal race ↵Jesse Hall2011-12-022-1/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition" into ics-mr1 * commit 'a91e54fed6a0690d59c97bab9b081b2614880563': SurfaceFlinger: fix layer removal race condition
| * | | | | | | | am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ↵Jesse Hall2011-12-022-1/+10
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473': SurfaceFlinger: fix layer removal race condition
| | * | | | | | | Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1Jesse Hall2011-12-022-1/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | SurfaceFlinger: fix layer removal race conditionJesse Hall2011-12-022-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer::lockPageFlip() and layer::onRemove() could be called on different threads and race such that lockPageFlip() successfully called mSurfaceTexture->updateTexImage() but then gets NULL back from mSurfaceTexture->getCurrentBuffer(), leading to a crash. This change moves Layer::onRemove() calls to SurfaceFlinger::commitTransaction() so they happen after the Layer is done being drawn from and only happen on the main surfaceflinger thread. Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
* | | | | | | | | | am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is ↵Robert Greenwalt2011-12-022-1/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in play" into ics-mr1 * commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2': Be careful sharing connections when dun is in play
| * | | | | | | | | am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ↵Robert Greenwalt2011-12-022-1/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8': Be careful sharing connections when dun is in play
| | * | | | | | | | Merge "Be careful sharing connections when dun is in play" into ics-mr1Robert Greenwalt2011-12-022-1/+22
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Be careful sharing connections when dun is in playRobert Greenwalt2011-12-022-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A request for a DUN connection should only use the carriers requested dun connection. Don't share another connection unless it matches the carriers settings. bug:5701374 Change-Id: I75a65fcfce1b218bd9ca4ce2ab85cbe850813321
* | | | | | | | | | am 0c7e894e: am 2f1e1e4a: Merge "Handle animations in Views\' rectangle ↵Gilles Debunne2011-12-023-38/+98
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clipping methods." into ics-mr1 * commit '0c7e894e79bea35f979d30e4e3bb6115b102cafd': Handle animations in Views' rectangle clipping methods.
| * | | | | | | | | am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping ↵Gilles Debunne2011-12-023-38/+98
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods." into ics-mr1 * commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161': Handle animations in Views' rectangle clipping methods.
| | * | | | | | | | Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1Gilles Debunne2011-12-023-38/+98
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Handle animations in Views' rectangle clipping methods.Gilles Debunne2011-12-013-38/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getChildVisibleRect and getLocationInWindow do not take the new mTransformationInfo View attribute. As a result, these methods return invalid value during an animation Bug 5638710 Changes in Patch Set 2: - temporary allocations removed using static thread local variables (method calls are NOT reentrant). - scroll should be handled *before* applying the transformation matrix. Fixed the call order in View#getLocationInWindow() Patch set 4: fix from comments. Patch set 5: <p>s Change-Id: I15dc44c0659305d9029c59a47aba3a738bb35ae1
* | | | | | | | | | | am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1John Reck2011-12-021-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90': Fix updateDoubleTapZoom logic
| * | | | | | | | | | am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1John Reck2011-12-021-5/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43bc6b094edda6baa8123115a33afaf454525376': Fix updateDoubleTapZoom logic
| | * | | | | | | | | Merge "Fix updateDoubleTapZoom logic" into ics-mr1John Reck2011-12-021-5/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix updateDoubleTapZoom logicJohn Reck2011-12-011-5/+6
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5698099 Change-Id: I83578e57cf809cbe7781d988302f0925dfddec80
* | | | | | | | | | | am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting ↵Mike Lockwood2011-12-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 * commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
| * | | | | | | | | | am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain ↵Mike Lockwood2011-12-022-42/+157
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subdirectories of the storage DO NOT MERGE" into ics-mr1 * commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd': MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
| | * | | | | | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories ↵Mike Lockwood2011-12-022-42/+157
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the storage DO NOT MERGE" into ics-mr1
| | | * | | | | | | | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-022-42/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage DO NOT MERGE Bug: 5527220 Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | | | | | | | am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more ↵Mike Lockwood2011-12-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 * commit '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
| * | | | | | | | | | | am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from ↵Mike Lockwood2011-12-021-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the MTP driver DO NOT MERGE" into ics-mr1 * commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
| | * | | | | | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP ↵Mike Lockwood2011-12-021-2/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | driver DO NOT MERGE" into ics-mr1
| | | * | | | | | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO ↵Mike Lockwood2011-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | | | | | | | | | | am 939a3dd4: am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN ↵Chia-chi Yeh2011-12-023-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '939a3dd4e7e2282786a8c5270855b611317ad241': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
| * | | | | | | | | | | am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS ↵Chia-chi Yeh2011-12-023-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
| | * | | | | | | | | | am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging ↵Chia-chi Yeh2011-12-023-0/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 * commit '431c3e4c7e2103865a90501a552b4e5145ed3f35': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
| | | * \ \ \ \ \ \ \ \ \ Merge "Documentation for the VPN sample for ICS SDK. Staging server: ↵Chia-chi Yeh2011-12-023-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
| | | | * | | | | | | | | | Documentation for the VPN sample for ICS SDK.Fred Chung2011-11-283-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html Change-Id: I35a17374fc0d9d165cedc9d6e1052eaec0028ace
* | | | | | | | | | | | | | am 54cf27d7: am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" ↵Jesse Hall2011-12-021-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '54cf27d7bbe27b1096f5e060c540f07dac07f1d0': Disable GLES20Canvas on emu w/o native GL
| * | | | | | | | | | | | | am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1Jesse Hall2011-12-021-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d90c1c6fedc7add177418324ba5e591af543fa4': Disable GLES20Canvas on emu w/o native GL
generated by cgit v1.1 at 2025-03-16 13:12:14 +0000