summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "kill HAVE_INOTIFY"Yabin Cui2014-11-111-27/+23
|\
| * kill HAVE_INOTIFYYabin Cui2014-11-101-27/+23
| | | | | | | | | | Bug: 18314841 Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
* | Merge "kill HAVE_SCHED_SETSCHEDULER"Yabin Cui2014-11-101-1/+2
|\ \
| * | kill HAVE_SCHED_SETSCHEDULERYabin Cui2014-11-101-1/+2
| |/ | | | | | | | | | | Bug: 18300670 Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
* | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-11-101-4/+15
|/ | | | | | | (cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.) bug: 17541634 Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
* am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."Vladimir Marko2014-10-291-1/+1
|\ | | | | | | | | * commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0': Fix android_media_AudioSystem_getMasterMute return type.
| * Fix android_media_AudioSystem_getMasterMute return type.Vladimir Marko2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | Caused FPU stack overflow on x86. Bug: 18023418 (cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc) Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
* | am 43a92646: Merge "Use native brige only if we have a private data directory."Calin Juravle2014-10-291-4/+8
|\ \ | |/ | | | | | | * commit '43a9264619e08f464dd4f184e53441a440cca09f': Use native brige only if we have a private data directory.
| * Use native brige only if we have a private data directory.Calin Juravle2014-10-291-4/+8
| | | | | | | | | | | | Bug: 18027433 Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
* | am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"Calin Juravle2014-10-281-13/+13
|\ \ | |/ | | | | | | * commit 'f7d24d244319599f62c22e29c3e6540d6cbadf49': PreInitializeNativeBridge only if its Available
| * PreInitializeNativeBridge only if its AvailableCalin Juravle2014-10-271-13/+13
| | | | | | | | | | | | | | Also, assert that we always have a private application directory for non system_server case. Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
* | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-203-65/+0
|\ \ | |/ | | | | | | | | | | with calls to Math" * commit 'dfcf065505a12aa358af5cd2607fd355eee964c4': Replacing FloatMath native implementation with calls to Math
| * Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-203-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
* | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native ↵Elliott Hughes2014-10-183-0/+65
|\ \ | | | | | | | | | | | | | | | | | | implementation with calls to Math"" * commit '84e6d466edc2aba711f90431a1cd209d11c0e70d': Revert "Replacing FloatMath native implementation with calls to Math"
| * \ Merge "Revert "Replacing FloatMath native implementation with calls to Math""Elliott Hughes2014-10-183-0/+65
| |\ \
| | * | Revert "Replacing FloatMath native implementation with calls to Math"Elliott Hughes2014-10-183-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32b88b48daa7383880088246d7222dd93cf55285. Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
* | | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation ↵Neil Fuller2014-10-163-65/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | with calls to Math" * commit '8a3785cafec4b47fe8d61614b04a0e193d616428': Replacing FloatMath native implementation with calls to Math
| * | | Merge "Replacing FloatMath native implementation with calls to Math"Neil Fuller2014-10-163-65/+0
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Replacing FloatMath native implementation with calls to MathNeil Fuller2014-10-153-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern versions of Android running in AOT mode FloatMath is slower than Math. Calls to Math.sqrt(), etc. are replaced by intrinsics which can be as small as a single CPU opcode. When running in interpreted mode the new implementation is unfortunately slower, but I'm judging this acceptable and likely to be improved over time. This change saves a small amount of native code. Example timings: Mako AOSP AOT: Method: Original / New / Direct call to Math ceil: 596ns / 146.ns / 111ns sqrt: 694ns / 56ns / 25ns Mako AOSP interpreted: Method: Original / New / Direct call to Math ceil: 1900ns / 2307ns / 1485ns sqrt: 1998ns / 2603ns / 1788ns Other calls Mako AOT: Method: Original / New cos: 635ns / 270ns exp: 566ns / 324ns floor: 604ns / 150ns hypot: 631ns / 232ns pow: 936ns / 643ns sin: 641ns / 299ns The advice to use Math directly, in preference to FloatMath, is still good. FloatMath will be deprecated separately. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
* | | am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-devMathieu Chartier2014-10-061-4/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075': Fix incorrect JNI_ABORT
| * | | Fix incorrect JNI_ABORTMathieu Chartier2014-10-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a copy, JNI_ABORT does NOT copy back into the corresponding java array. Changing this to 0 is what you want since this will copy the data back if needed and free the temporary storage. Bug: 16858794 Change-Id: I3f3b426ea3cbba577bb720532c16ebf7493f1c1c
* | | | am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-031-8/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb': Cleanup DeferredLayerUpdater
| * | | Cleanup DeferredLayerUpdaterJohn Reck2014-10-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17765082 DeferredLayerUpdater had fallen behind RT updates. Re-snap to latest expectations, ensuring to call requireGlContext() prior to detachSurfaceTexture to avoid leaking SurfaceTextures Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
* | | | am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a ↵Adam Powell2014-10-011-23/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | shared lib"" into lmp-dev * commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81': Revert "Fix issue with using locally defined attrs in a shared lib"
| * | | Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" ↵Adam Powell2014-10-011-23/+4
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | Revert "Fix issue with using locally defined attrs in a shared lib"Adam Powell2014-10-011-23/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6. The reverted commit caused issues loading resources supplied by static libraries. Bug 17748356 Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
* | | | | am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared ↵Adam Lesinski2014-10-011-4/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lib" into lmp-dev * commit 'cd8e73817d14798f9d2031ffd301a03a096b7907': Fix issue with using locally defined attrs in a shared lib
| * | | | Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-devAdam Lesinski2014-10-011-4/+23
| |\ \ \ \ | | |/ / /
| | * | | Fix issue with using locally defined attrs in a shared libAdam Lesinski2014-09-301-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attribute name resource IDs were never fixed up with the runtime package ID so we weren't finding attributes whenever the runtime package ID was different than the build time one, which happened to be when a shared lib referenced itself (0x00 vs 0x02). Bug:17666947 Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
* | | | | am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote ↵Elliott Hughes2014-09-301-16/+17
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | failures." * commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b': Use strerror(3) when reporting zygote failures.
| * | | | Use strerror(3) when reporting zygote failures.Elliott Hughes2014-09-301-16/+17
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 17700596 Change-Id: I39a72ab6f19063de3c90c9fccdb749dc9a86324e
| * | | Allow AOSP to boot.Dan Albert2014-09-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAVE_OOM_ADJ is really __linux__, and this code should never be run on another platform. Bug: 17641445 Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
* | | | am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc ↵Ruben Brunk2014-09-301-13/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | buffers." into lmp-dev * commit 'b3c802f2381c3411fe753206ab89027f60164b77': camera2: Use valid dimensions for RGBA8888 gralloc buffers.
| * | | Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-devRuben Brunk2014-09-301-13/+10
| |\ \ \
| | * | | camera2: Use valid dimensions for RGBA8888 gralloc buffers.Ruben Brunk2014-09-301-13/+10
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17675571 - All of the mistakes were made. Unmake them. Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
* | | | am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in ↵Dianne Hackborn2014-09-301-11/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Window Manager" into lmp-dev * commit '9cf01b63cb0023aec0e05b1ce050ff572532b876': More work on issue #17656716: Unhandled exception in Window Manager
| * | | More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-301-11/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop down the limit on when we log, since under normal operation we will never get more than a few K of data due to strict mode. Try to clean up the code paths coming in and out of binder IPCs to plug any places where we could disrupt the gather flag of a thread, causing it to keep gathering stack crawls (which is the thing that is causing our strict mode data to become so large). Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
| * | Frameworks/base: Early init native bridgejgu212014-09-281-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the app directory to the arguments for starting a process. Add a check for NeedsNativeBridge and a call to PreInitializeBridge in the native fork code. (cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5) Bug: 17671501 Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
* | | am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into ↵Ruben Brunk2014-09-271-39/+72
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1': camera2: Fix native ImageReader test segfaults.
| * | Merge "camera2: Fix native ImageReader test segfaults." into lmp-devRuben Brunk2014-09-271-39/+72
| |\ \
| | * | camera2: Fix native ImageReader test segfaults.Ruben Brunk2014-09-261-39/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17675571 - Check for JPEG footer in correct location from ImageReader when using the RGBA override. - Add additional error checks in produceFrame method. - Avoid allocating extra space for jpeg buffers due to incorrect width calculations. Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
* | | | am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor ↵Dave Burke2014-09-261-11/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | instead of the file."" into lmp-dev * commit 'e09e20eeca4b822855e02507a4e30387ea4ee1a6': Revert "Fix memory leak where we close the descriptor instead of the file."
| * | | Merge "Revert "Fix memory leak where we close the descriptor instead of the ↵Dave Burke2014-09-261-11/+5
| |\ \ \ | | | | | | | | | | | | | | | file."" into lmp-dev
| | * | | Revert "Fix memory leak where we close the descriptor instead of the file."Jérôme Poichet2014-09-261-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa. Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
* | | | | am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window ↵Dianne Hackborn2014-09-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Manager" into lmp-dev * commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d': Work on issue #17656716: Unhandled exception in Window Manager
| * | | | Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create descriptive errors when sending unreasonably large parcels through IPC. Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
* | | | | am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-241-8/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51': camera2: Hide JPEGs in RGBA gralloc buffers.
| * | | | Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-241-8/+17
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | camera2: Hide JPEGs in RGBA gralloc buffers.Ruben Brunk2014-09-241-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17379185 - WAR for SW Write usage flags being unavailable on certain devices for JPEG (blob) format buffers. Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
* | | | | resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-241-11/+35
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1