summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4bedb481: Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
|\ | | | | | | | | * commit '4bedb481036fbc6b72e5c0c620b569b508d3be16': Fix compilation with Clang.
| * Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
| |\
| | * Fix compilation with Clang.Evgeniy Stepanov2012-01-131-4/+0
| | | | | | | | | | | | | | | | | | | | | warning: extraneous template parameter list in template specialization template<> Change-Id: If3e3e1d06a018343b40ac0984dfd9ecc12629f8d
* | | am dfef1994: Merge "Fix a few memory leaks in the input dispatcher."Jeff Brown2012-01-132-6/+27
|\ \ \ | |/ / | | | | | | | | | * commit 'dfef19940f2af5c043e0c6fb49909f093b8ff96b': Fix a few memory leaks in the input dispatcher.
| * | Merge "Fix a few memory leaks in the input dispatcher."Jeff Brown2012-01-132-6/+27
| |\ \
| | * | Fix a few memory leaks in the input dispatcher.Jeff Brown2012-01-122-6/+27
| | | | | | | | | | | | | | | | | | | | Bug: 5862398 Change-Id: Iae3284a223b8307f541a7987f90f5b28e70b9244
* | | | am 893eace6: Merge "Sub display list in TextView"Gilles Debunne2012-01-137-36/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '893eace60992a640064b454d7ad477c1bbffcb1d': Sub display list in TextView
| * | | Merge "Sub display list in TextView"Gilles Debunne2012-01-137-36/+72
| |\ \ \
| | * | | Sub display list in TextViewGilles Debunne2012-01-127-36/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextView uses a sub-display list to 'cache' the rendering of its text. This saves time when drawing an editable text, where the blinking cursor forces a re-draw twice per second, which creates pauses during scrolling. Added a sub-display list invalidation when an appearance span is modified/added/removed. Also added an invalidation of the display list when selection range is changed. Change-Id: I41e8068a12902b8a745c5bb77de8c77def76a270
* | | | | am d615f34b: Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd615f34b565bce98e202397240448845b934e596': media/mtp: Add missing LOCAL_C_INCLUDES
| * | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
| |\ \ \ \
| | * | | | media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the source files here is including <cutils/tztime.h> which itself includes <bionic_time.h>, a private C library header used to define the strftime_tz() extension (which used to be declared in <time.h> but was moved there instead). Add a missing C include path to let our code compile as usual. Change-Id: I6aac2f1d3d15ad182679c81ff3f4febff74eb671
* | | | | am d36f7d24: Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd36f7d249591559e713a8ca45c6d452c14c94895': Add support for new root.expand() calls.
| * | | | Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
| |\ \ \ \
| | * | | | Add support for new root.expand() calls.Stephen Hines2012-01-123-192/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=5444144 Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
* | | | | | am 1e808691: Get AID_GRAPHICS from right placeGlenn Kasten2012-01-132-16/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '1e80869133924e1ffff5c10ca787da303fd0b53d': Get AID_GRAPHICS from right place
| * | | | | Get AID_GRAPHICS from right placeGlenn Kasten2012-01-132-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
* | | | | | am fcbbaf1d: resolved conflicts for merge of e80341c8 to masterKenny Root2012-01-131-2/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3': Fix issue with selecting proper JNI libraries
| * | | | | resolved conflicts for merge of e80341c8 to masterKenny Root2012-01-131-2/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
| | * \ \ \ \ am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1Kenny Root2012-01-131-2/+14
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30': Fix issue with selecting proper JNI libraries
| | | * \ \ \ \ Merge "Fix issue with selecting proper JNI libraries" into ics-mr1Kenny Root2012-01-131-2/+14
| | | |\ \ \ \ \
| | | | * | | | | Fix issue with selecting proper JNI librariesAnthony Mazzola2011-12-201-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code will load both abi and abi2 versions of the JNI libraries. The second one found will be the library in use. Update algorithm so that abi2 libraries will never be loaded once we find a library that supports the primary abi. This is consistent with the original implementation. Bug: 5787224 Change-Id: Ib4d30bea8316ca9bf62757c970dcc5b75cd969ec
* | | | | | | | | am f88d1493: am 10065177: am 2e282f35: Merge "Fix issue #5823276: home ↵Dianne Hackborn2012-01-134-17/+36
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repaints after full-screen app is exited" into ics-mr1 * commit 'f88d1493aa968d3da551116f076edd5e21f7ccfc': Fix issue #5823276: home repaints after full-screen app is exited
| * | | | | | | | am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after ↵Dianne Hackborn2012-01-134-17/+36
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '100651779fde99f7ae2a10719d688b51115f08e9': Fix issue #5823276: home repaints after full-screen app is exited
| | * | | | | | | am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app ↵Dianne Hackborn2012-01-134-17/+36
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is exited" into ics-mr1 * commit '2e282f35b009fe4c23daca35592dae2032641643': Fix issue #5823276: home repaints after full-screen app is exited
| | | * | | | | | Merge "Fix issue #5823276: home repaints after full-screen app is exited" ↵Dianne Hackborn2012-01-134-17/+36
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | | | * | | | | | Fix issue #5823276: home repaints after full-screen app is exitedDianne Hackborn2012-01-124-17/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't consider a window as a candidate for the top fullscreen window if it is not going to be a candiate for layout. Also don't consider windows a candidate for layout if their app token is hidden. This fixes a transient state where we are preparing to unhide the window but have not done so yet. Change-Id: Ife5299ffa003c1df1a4f787b7a2809cbf614ec16
* | | | | | | | | | Merge "Start implementing SurfaceTexture streaming into RS allocations." ↵Jason Sams2012-01-1313-4/+127
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into graphics-dev
| * | | | | | | | | | Start implementing SurfaceTexture streaming into RS allocations.Jason Sams2012-01-1313-4/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I561fbb63c63371ea59047c07fb2d68c21d16e76b
* | | | | | | | | | | am 31cef145: am bcce2a19: am da7b7700: Merge "Update to latest version of ↵Bart Sears2012-01-134-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Roboto" into ics-mr1 * commit '31cef1451e84e613825a78716f4b8cedd5ae9084': Update to latest version of Roboto
| * | | | | | | | | | am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ↵Bart Sears2012-01-134-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'bcce2a195390c3f5fc235c3fa551d3d725a7f88a': Update to latest version of Roboto
| | * | | | | | | | | am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1Bart Sears2012-01-134-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6': Update to latest version of Roboto
| | | * | | | | | | | Merge "Update to latest version of Roboto" into ics-mr1Bart Sears2012-01-134-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Update to latest version of RobotoBart Sears2012-01-134-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5527891 U+0125 (h with Circumflex): Moved the Circumflex to not stick out beyond the left edge of the "h" U+0300, U+0301, U+0303, U+0309, U+030F, U+0323: Move to the left so that they can be composited. U+047C (Capital Omega with Titlo): Fixed the Titlo accent U+047D (Small Omega with Titlo): Fixed the Titlo accent U+048E (Capital ER with tick): Changed the tick to be diagonal U+2248 (Almost equal to): Added the glyph Change-Id: Ibcadcd008a58f42d8bd4238d768101d8bf726ff6
* | | | | | | | | | | | am ecce05fa: am 89620c5d: am 2cf18d28: Merge "Streamline package-installed ↵Christopher Tate2012-01-131-57/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling by the Backup Manager" into ics-mr1 * commit 'ecce05fac6600d01b5dca1cbf6345837e2840c5a': Streamline package-installed handling by the Backup Manager
| * | | | | | | | | | | am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by ↵Christopher Tate2012-01-131-57/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Backup Manager" into ics-mr1 * commit '89620c5d982858f590f3740169c9f69ee380be3e': Streamline package-installed handling by the Backup Manager
| | * | | | | | | | | | am 2cf18d28: Merge "Streamline package-installed handling by the Backup ↵Christopher Tate2012-01-131-57/+55
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manager" into ics-mr1 * commit '2cf18d28785fdd188641867503586627cb212302': Streamline package-installed handling by the Backup Manager
| | | * | | | | | | | | Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1Christopher Tate2012-01-131-57/+55
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Streamline package-installed handling by the Backup ManagerChristopher Tate2012-01-121-57/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, don't do O(asec_apps * installed_apps) work during the broadcast receiver's operation. On devices with many installed apps and a large number of them moved to ASECs, this was causing the system process to become unresponsive and the watchdog to fire -- which in turn would initiate a restart loop, as the same package-installed broadcast would then be issued again once the package manager rescanned the ASEC containers, ad infinitum. With this change, the expensive call to the package manager is only made once rather than asec_apps times. Bug 5850283 Change-Id: I14e280ea1fa6af19cebc58869a20fbb599c92c8c
* | | | | | | | | | | | | am 60c6b082: Merge "Remove unused parameter"Romain Guy2012-01-132-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '60c6b082eaa534402911adb2a5e76618e6e0e49d': Remove unused parameter
| * | | | | | | | | | | | Merge "Remove unused parameter"Romain Guy2012-01-132-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove unused parameterRomain Guy2012-01-132-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0896b2cdb9f1fa9c5e191e4ea425e22ac6f10f29
* | | | | | | | | | | | | | am 70f52e6d: am e6572304: am 2753e826: Merge "Fix teardown of secondary ↵John Huang2012-01-131-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections on CDMA" into ics-mr1 * commit '70f52e6d795f1cd4d23efcbdc2b9e2f9d0c22eb6': Fix teardown of secondary connections on CDMA
| * | | | | | | | | | | | | am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on ↵John Huang2012-01-131-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CDMA" into ics-mr1 * commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2': Fix teardown of secondary connections on CDMA
| | * | | | | | | | | | | | am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1John Huang2012-01-131-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b': Fix teardown of secondary connections on CDMA
| | | * | | | | | | | | | | Merge "Fix teardown of secondary connections on CDMA" into ics-mr1John Huang2012-01-131-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix teardown of secondary connections on CDMARobert Greenwalt2012-01-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restores functionallity from Gingerbread. We should tear down when the enabledcount goes to zero, but we should always notify and attempt to switch back to default when indicated. bug:5830081 Change-Id: Ib8469bb5369da21e8cc05fb755b2d7e24c8e02a6
* | | | | | | | | | | | | | | am 134a6835: am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright ↵Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc/amrwbenc: Remove trailing whitespace" * commit '134a68356534951f5a6792e30f61db518c6b6ad8': stagefright aacenc/amrwbenc: Remove trailing whitespace
| * | | | | | | | | | | | | | am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: ↵Jean-Baptiste Queru2012-01-13133-5071/+5071
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace" * commit 'c0ef548c748f0c3bc917eff7b50941f9cbe1df86': stagefright aacenc/amrwbenc: Remove trailing whitespace
| | * | | | | | | | | | | | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove ↵Jean-Baptiste Queru2012-01-13133-5071/+5071
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trailing whitespace" * commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d': stagefright aacenc/amrwbenc: Remove trailing whitespace
generated by cgit v1.1 at 2025-02-05 09:09:20 +0000