summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-13Revert "frameworks/base: Disable hardware rendering for now"linaro_android_4.0.1_origenZach Pfeffer
This reverts commit 4abc51753c40d39701beae07a658ef0364c0c245.
2011-12-09Merge "screenshot: Add include path to where png.h can be found" into ↵Bernhard Rosenkraenzer
linaro_android_4.0.1
2011-12-08screenshot: Add include path to where png.h can be foundTony Mansson
Change-Id: I720b2bb2b939f6d2b879974961b3e5613426b453
2011-12-08frameworks/base: Fix aliasing violationsBernhard Rosenkraenzer
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-12-07Merge "MediaSamplesTest: add test for play various format media files" into ↵Zach Pfeffer
linaro_android_4.0.1
2011-12-07Merge "frameworks/base: Fix aliasing violations" into linaro_android_4.0.1Bernhard Rosenkraenzer
2011-12-07frameworks/base: Fix aliasing violationsBernhard Rosenkraenzer
This makes it possible to build the code without disabling the strict-aliasing optimization in gcc. Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-12-02MediaSamplesTest: add test for play various format media filesYongqin Liu
modify Android.mk to make it be built into images when building at eng version. The blueprint is below: https://blueprints.launchpad.net/lava-android-test/+spec/lava-android-test-run-mmtest-in-lava Change-Id: Ia9b18eff04ee730c33cca85761f8d71d8b9e66c1 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2011-11-30aapt: update interfaces to libpng 1.5.7 beta 01Chao Yang
Libpng 1.5.7 beta 01 is integrated, where some interfaces are changed and some structures are not visible to libpng clients any more. The structure information can be retrieved through specific interfaces. The call to png_set_filler() is removed as it can corrupt some png files. This function was used for libpng 1.2.4, but actually it did nothing in aapt. Remove a building warning in ZipFile.h. Change-Id: I92ca6a2c0d734f9a5187d5a7f6727b8be0e77133
2011-11-18frameworks/base: Disable hardware rendering for nowBernhard Rosenkraenzer
Disable hardware rendering for now - let's get a build with software rendering using purely free stuff going first... Author: Vishal Bhoj <Vishal.Bhoj@linaro.org> Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkraenzer@linaro.org>
2011-11-18frameworks/base: Assorted build fixesBernhard Rosenkraenzer
Assorted build fixes for gcc 4.6 and -DNDEBUG Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-11-11Fix bug in TextLayoutCacheKey handling embedded nulls.android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-factoryrom-2-releaseJeff Brown
We were not passing the length of the UTF-16 string to String16::setTo. As a result, it was copying the contents of the text up to the first null it found. First problem, these strings are not typically null terminated! Second problem, if the string contained a null character, then we might truncate it. However, we only truncated the string when the copy constructor was invoked (say, when we called get() on the cache) but not in internalTextCopy() (before adding the key to the cache). As a result of the second problem, we would first search the cache for a key that matched a partially copied truncated string (potentially reading uninitialized memory that followed it). Finding none, we would add the entry to the cache using the correct key. If the cache already had a value associated with the correct key, then the put would fail, returning false. Charging ever onwards, we would add the size of the entry to the cache size. Proceeding in this manner, it was possible for the cache to believe it had less remaining space than it really did. At that point, it was possible for the cache to evict all entries and yet still not think it had room to add a new one, so it would continue trying to make space indefinitely. Bug: 5576812 Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
2011-11-04Fix a leak in Parcel::writeBlob.Jeff Brown
Was mistakenly assuming that Parcel::writeFileDescriptor took ownership of the fd that was passed in. It does not! Added some comments and a default parameter to allow the caller to specify whether it wishes the Parcel to take ownership. Bug: 5563374 Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber
Change-Id: I3c288698920fe6ead0df24a52330483609821a41 related-to-bug: 5549263
2011-11-02Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"The Android Automerger
This reverts commit 7f00c22b7fa7b38b644585c0a3c6faadc5def94c, reversing changes made to 451fa13e82ea1226895b41282fdb33bf9fea5d19.
2011-11-02Revert "Merge "BatteryService(jni): properly handle read's return value" ↵The Android Automerger
into ics-mr0" This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
2011-11-02Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
2011-11-02Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"The Android Automerger
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
2011-11-02Revert "Merge "Improve the slow query instrumentation." into ics-mr0"The Android Automerger
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger
2011-11-02Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer
2011-11-02Merge "Doc change: Update instructions to match ICS UI" into ics-mr0Katie McCormick
2011-11-02Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I2f073cc6d62d757ba4e6565a0c7974ca9cecba4c
2011-11-02Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0Irfan Sheriff
2011-11-02Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt
2011-11-02Doc change: Update instructions to match ICS UIKatie McCormick
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
2011-11-02Ignore errors when untetheringRobert Greenwalt
Sometimes the interface is removed before we can untether leading to errors when cleanup up various rules (iptables). Do as much as we can and then let a re-tether result in error if needed. bug:5536516 Change-Id: Ib1d064ecc8e9022566f9b0e4678b33144906971c
2011-11-02docs: a couple typosScott Main
bugs 5552478 5553096 Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
2011-11-02Revert "Merge "BatteryService(jni): properly handle read's return value" ↵The Android Automerger
into ics-mr0" This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
2011-11-02Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
2011-11-02Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"The Android Automerger
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
2011-11-02Revert "Merge "Improve the slow query instrumentation." into ics-mr0"The Android Automerger
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger
2011-11-02Revert "Merge "BatteryService(jni): properly handle read's return value" ↵The Android Automerger
into ics-mr0" This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
2011-11-01Merge "Specify component name for provisioning" into ics-mr0Irfan Sheriff
2011-11-01Merge "Process AMS events in NetworkPolicy handler." into ics-mr0Jeff Sharkey
2011-11-01Process AMS events in NetworkPolicy handler.Jeff Sharkey
When a process changes foreground status or dies, NetworkPolicy updates its internal state with a lock held. In cases where there is contention, this can block the AMS handler and prevent other events, such as broadcasts, from being dispatched. This change moves the incoming AMS events to an existing internal NetworkPolicy handler thread, where they can execute without blocking AMS. Bug: 5497544 Change-Id: Ie0c620a620fd9f0f4eb02af510bd819efa4deb6a
2011-11-01Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz ↵Fabrice Di Meglio
-- need to force to single run" - make single run case non verbose Change-Id: I5c3b87aeb613697233290ddecac3ca00f58f8313
2011-11-01Merge "Doc Update: Update list of widget classes" into ics-mr0Katie McCormick
2011-11-01Doc Update: Update list of widget classesKatie McCormick
Change-Id: I820848b45e991be6e5b7e7bc2f280caf60fb7f7e
2011-11-01Specify component name for provisioningIrfan Sheriff
Bug: 5544654 Change-Id: I977cad131f7c4d9776997fc3153f4c0d12063af2
2011-11-01Merge "BatteryService(jni): properly handle read's return value" into ics-mr0Dima Zavin
2011-11-01Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0Robert Greenwalt
2011-11-01Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" ↵Fabrice Di Meglio
into ics-mr0
2011-11-01Avoid duplicate dialogs leading to NPEIrfan Sheriff
Bug: 5548268 Change-Id: I383d5dba5ed2d77c1623d03990f1139872a65e2a
2011-11-01Add cdma_rmnet4 to list of monitored interfacesRobert Greenwalt
Lets the data traffic arrows work on LTE device on 1x, but also lets telephony monitor for hung radios on 1X. bug:5531630 Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGEFabrice Di Meglio
- better check of ICU returned values - default to single run if ICU is returning errors Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
2011-11-01Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
2011-11-01Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" ↵Jim Miller
into ics-mr0
2011-10-31Merge "Update camera continuous autofocus javadoc." into ics-mr0Chih-Chung Chang
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 19:35:43 +0000