summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "connect/disconnect is now called from our EGL wrapper"Mathias Agopian2011-08-015-12/+35
|\
| * connect/disconnect is now called from our EGL wrapperMathias Agopian2011-08-015-12/+35
| | | | | | | | | | | | | | | | | | | | | | the original connect/disconnect hooks are deprecated and replace by api_connect/api_disconnect. the original hooks are no no-ops. api_connect/api_disconnect is now only called from the android framework. Bug: 5057915 Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
* | Merge "Add operation counts to network statistics."Jeff Sharkey2011-08-0116-246/+594
|\ \
| * | Add operation counts to network statistics.Jeff Sharkey2011-07-2916-246/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide API to increment "operation counts" for a UID and tag, used to eventually derive bytes/operation stats. Internally is stored at network layer, but should belong at data layer. Switch profiling to use data layer stats, which are emulated by summarizing network layer details. Read packet counts from new /proc/ columns and collect them into NetworkStatsHistory. Prevent double-counting by ignoring values from first snapshot. Watch for duplicate /proc/ entries. Update tests to verify packet and operation counters. Bug: 5052136, 5097392 Change-Id: I1832f65a2b8a9188f8088f253474a667c21a2f09
* | | Merge "Use high precision iterators on specific GPUs Bug #5098359"Romain Guy2011-08-013-18/+41
|\ \ \
| * | | Use high precision iterators on specific GPUsRomain Guy2011-08-013-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | Bug #5098359 Change-Id: I52ee8c7b4c9e8d4c7bedb684eaf7bef6c44c74b9
* | | | Merge "Add functional test for screenshots."Brett Chabot2011-08-016-1/+266
|\ \ \ \
| * | | | Add functional test for screenshots.Brett Chabot2011-07-286-1/+266
| | | | | | | | | | | | | | | | | | | | Change-Id: Ice2cbc656f9814da7d0634644a250c1af9243ad1
* | | | | am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge ↵Jean-Baptiste Queru2011-08-010-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Stagefright: Return error if codec takes too long to return a buffer." * commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb': Stagefright: Return error if codec takes too long to return a buffer.
| * \ \ \ \ am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return ↵Jean-Baptiste Queru2011-08-010-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error if codec takes too long to return a buffer." * commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3': Stagefright: Return error if codec takes too long to return a buffer.
| | * \ \ \ \ am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes ↵Jean-Baptiste Queru2011-08-011-2/+12
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too long to return a buffer." * commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac': Stagefright: Return error if codec takes too long to return a buffer.
| | | * \ \ \ \ am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to ↵Jean-Baptiste Queru2011-08-011-2/+12
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return a buffer." * commit '5e57c2cf83ef62e9887592b46a4c3352662fb988': Stagefright: Return error if codec takes too long to return a buffer.
| | | | * \ \ \ \ Merge "Stagefright: Return error if codec takes too long to return a buffer."Jean-Baptiste Queru2011-08-011-2/+12
| | | | |\ \ \ \ \
| | | | | * | | | | Stagefright: Return error if codec takes too long to return a buffer.Anu Sundararajan2011-04-141-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many scenarios where the codec may not return a valid buffer. In such a case, the OMXCodec::read() call hangs indefitely. Therefore, wait() call is replaced with waitRelative() so that it timesout after a few seconds and we exit gracefully. Change-Id: Ie03c5d1e979b71f6253efcaa0665aa5e541cebe2 Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
* | | | | | | | | | Merge "Revert "Unhide APIs for user space VPN.""Chia-chi Yeh2011-08-013-22/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Unhide APIs for user space VPN."Chia-chi Yeh2011-08-013-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c2529c717cda3df321c1d0d6abe23ac1f298ac9. Change-Id: I37d4ea6c1079d337ede7ac567d88414a41fc1e11
* | | | | | | | | | | Merge "Plug memory leak in EditText."Romain Guy2011-08-013-23/+35
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Plug memory leak in EditText.Romain Guy2011-08-013-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b42c23ceeaa958d02255945c35ff6807c177114
* | | | | | | | | | | Merge "SurfaceFlinger: use async mode for video & cam"Jamie Gennis2011-08-013-1/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SurfaceFlinger: use async mode for video & camJamie Gennis2011-07-303-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceFlinger's SurfaceTexture objects default to async mode whenever a camera or video decoder connects. This behavior can be disabled by #defining NEVER_DEFAULT_TO_ASYNC_MODE. Change-Id: I8965951d1775915da180e4af298dd7af3afafecc
* | | | | | | | | | | | Merge "Fix exception when a focused item is detached."Bjorn Bringert2011-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix exception when a focused item is detached.Mark Brophy2011-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a ListView has itemsCanFocus set, and scrolling moves the currently focused item off the display, its focus is cleared. This is checked by calling getDistanceToView(). However, it's possible that the view will have been recycled. If so, it will have been detached from the parent by calling ViewGroup.detachViewFromParent. Since this doesn't clear the view's focus, we'll still try to call getDistanceFromView(), causing an IllegalArgumentException since the view is not a descendant of the ListView anymore. Check whether the view is still a descendant before calling getDistanceToView(). If it's not, we also need to clear the focus. Bug: 4556022 Change-Id: Iebee56032223b70d714e2ec3bb7a19093ab5f81c
* | | | | | | | | | | | Merge "Fix NALU extraction of unit starts with a 0x00 nalType"Andreas Huber2011-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix NALU extraction of unit starts with a 0x00 nalTypeAndreas Huber2011-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by not backing up beyond the start of the nal unit. Change-Id: I5fba9913202de416e634e5f39181be62b72b2469 related-to-bug: 4770290
* | | | | | | | | | | | | Merge "SurfaceTexture: allow set_buffer_count(2)"Jamie Gennis2011-08-011-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SurfaceTexture: allow set_buffer_count(2)Jamie Gennis2011-07-301-5/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change relaxes an error check in SurfaceTexture::setBufferCount to allow clients to explicitly set a buffer count of 2. The clients that will do this are camera and video decode. Previously it was thought that for those clients we would always use async mode, which requires a minimum of 3 buffers. However, we now believe that for some devices it may make sense to use synchronous mode (with 2 buffers) to reduce memory usage. Bug: 5088418 Change-Id: I620a0ef75075745be9d6c8219e0246aaf33ba950
* | | | | | | | | | | | | Merge "Fixing initialization cleanup in activity instrumentation test case"Romain Guy2011-08-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixing initialization cleanup in activity instrumentation test caseRodrigo Damazio Bovendorp2011-08-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I798fed657ccdc27430edc07d1e911b34c45426b5
* | | | | | | | | | | | | | Merge "Hide permissions that are not available to apps."Dianne Hackborn2011-08-012-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Hide permissions that are not available to apps.Dianne Hackborn2011-08-012-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f3bc72114b780fffe218a5600bfd011ede029d3
* | | | | | | | | | | | | | | Merge "improve GraphicAllocator dump method"Mathias Agopian2011-08-011-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | improve GraphicAllocator dump methodMathias Agopian2011-07-291-5/+17
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GraphicAllocator debugging cannot deal with custom HAL formats. make this more obvious in the log. Change-Id: I202e58a7f213f32e725aa4eac62cdf6e50ca5894
* | | | | | | | | | | | | | | Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943"Jeff Brown2011-08-011-22/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Tweak hover for better accessibility and compatibility.Jeff Brown2011-07-281-22/+26
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5087943 Change-Id: I5533c18ec042b8d9cb590d8d3b22ce4a391c910d
* | | | | | | | | | | | | | | Merge "SurfaceFlinger: abandon Layer SurfaceTextures"Jamie Gennis2011-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | SurfaceFlinger: abandon Layer SurfaceTexturesJamie Gennis2011-07-301-0/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the Layer::onRemoved method call SurfaceTextures::abandon on the layer's SurfaceTexture. This will cause all client-initiated operations on the SurfaceTexture to fail. In particular, this will result in an error on the client side, rather than a deadlock when removing a layer that used a SurfaceTexture in synchronous mode. Change-Id: I14014d00369f29560a21b606831edee432bb8867 Bug: 5020874
* | | | | | | | | | | | | | | am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import ↵Eric Fischer2011-08-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revised translations. DO NOT MERGE" into gingerbread * commit '72b7a7d90b631a703681751c02f1447e3c75ccb0': Import revised translations. DO NOT MERGE
| * | | | | | | | | | | | | am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO ↵Eric Fischer2011-08-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread * commit 'f01b3cfa9ac2869e3762a90917569186039a9665': Import revised translations. DO NOT MERGE
| | * | | | | | | | | | | | am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-08-0141-318/+400
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7': Import revised translations. DO NOT MERGE
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-08-0141-318/+400
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-06-2941-318/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d20fc3f79a16adf99cf8dc8465b79adcd8b38d7
* | | | | | | | | | | | | | | | Merge "Start playing live streaming HLS content from the first segment."Andreas Huber2011-08-011-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Start playing live streaming HLS content from the first segment.Andreas Huber2011-08-011-11/+10
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also properly signal a "hard" discontinuity, i.e. a possible format change when a discontinuity is signalled explicitly as part of the playlist. Change-Id: Ic347d3d11d39b0411c3726a7c723bcf13092b8bc related-to-bug: 5103155, 5103013
* | | | | | | | | | | | | | | | Merge "Change setDevicePropertyNative to no block."Matthew Xie2011-08-011-13/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Change setDevicePropertyNative to no block.Matthew Xie2011-07-291-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change setDevicePropertyNative to use async dbus call to bluez instead of blocking call. The old call was dbus_connection_send_with_reply_and_block. It is replaced by dbus_connection_send_with_reply. Change-Id: I1a772b33b54c8aad71a6f4d86dcd289354d8155b
* | | | | | | | | | | | | | | | Merge "Sort the suggestions based based on the length of the text they are ↵Luca Zanolin2011-08-011-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attached too."
| * | | | | | | | | | | | | | | | Sort the suggestions based based on the length of the text they are attached ↵Luca Zanolin2011-08-011-3/+36
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. When the suggestions are displayed, the shortest one will be at the top of the list, as they are the most relevant one. Bug: 5006130 Change-Id: Id3ac3accce5198a6a58a0c3028ee5f77957ceac6
* | | | | | | | | | | | | | | | Merge "MediaScanner: Move genre table management to MediaProvider"Mike Lockwood2011-08-012-53/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | MediaScanner: Move genre table management to MediaProviderMike Lockwood2011-07-312-53/+10
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems introduced with bulk insert support Bug: 5092877 Change-Id: If3c0c9054d5effe0a1d7a75e85635b41ba1591f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | | | | | Merge "Update list_ states Bug: 5076695"Justin Ho2011-08-0129-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-01-20 14:55:03 +0000