Neil Fuller
06965cfd12
am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math"
...
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
Replacing FloatMath native implementation with calls to Math
2014-10-16 09:35:43 +00:00
Neil Fuller
fd2d41b742
Merge "Replacing FloatMath native implementation with calls to Math"
2014-10-16 08:16:24 +00:00
Neil Fuller
32b88b48da
Replacing FloatMath native implementation with calls to Math
...
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
2014-10-15 11:47:58 +01:00
Chris Craik
f1f5481817
am a7315a14: am 86fd9278: Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev
...
* commit 'a7315a14609497363e72c9a8459f9ffe70e0f546':
Enable fast jni for simple RenderNode/Matrix/Paint operations
2014-10-08 20:07:02 +00:00
Chris Craik
86fd9278a9
Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into lmp-mr1-dev
2014-10-08 19:58:13 +00:00
Chris Craik
4136a0aeac
Enable fast jni for simple RenderNode/Matrix/Paint operations
...
bug:17895119
Change-Id: Id83bfd719ec873028f0d4e7e4e4c0702f3bb3dd9
2014-10-07 15:09:46 -07:00
Mathieu Chartier
361e204991
am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '830467e2873767ff11960c3b9fecb2e7d4c57b21':
Fix incorrect JNI_ABORT
2014-10-07 00:13:14 +00:00
Mathieu Chartier
5ade30e82e
am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev
...
* commit '405a934ec46fccf7d2e6e573bb65a5be4b51665a':
Fix incorrect JNI_ABORT
2014-10-06 23:50:55 +00:00
Mathieu Chartier
6a5e6df968
Fix incorrect JNI_ABORT
...
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
2014-10-06 12:44:09 -07:00
John Reck
6e4140c6e2
am c4694796: am 6a2296d8: am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit 'c4694796a952014d07e6d083749d2f8b7d06afee':
Cleanup DeferredLayerUpdater
2014-10-04 15:45:20 +00:00
John Reck
6a2296d856
am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev
...
* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
2014-10-03 23:57:30 +00:00
John Reck
749906b468
Cleanup DeferredLayerUpdater
...
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
2014-10-03 15:02:19 -07:00
Adam Powell
e18d68d6ab
am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
...
* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
Revert "Fix issue with using locally defined attrs in a shared lib"
2014-10-02 12:38:21 +00:00
Adam Powell
8628387c60
am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
...
* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
Revert "Fix issue with using locally defined attrs in a shared lib"
2014-10-01 22:15:56 +00:00
Adam Powell
c6a06d437c
Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
2014-10-01 18:31:56 +00:00
Adam Powell
908c748096
Revert "Fix issue with using locally defined attrs in a shared lib"
...
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.
The reverted commit caused issues loading resources supplied by static libraries.
Bug 17748356
Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
2014-10-01 18:11:18 +00:00
Adam Lesinski
7923da5f5d
am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
...
* commit '06f380e9efa4698c223077cacaa2df80a704ef96':
Fix issue with using locally defined attrs in a shared lib
2014-10-01 17:11:10 +00:00
Ruben Brunk
e60986611f
am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
...
* commit 'df26108539c1ca134bece1c75d96b96f71c0e3f5':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
2014-10-01 17:10:12 +00:00
Dianne Hackborn
67787a82a0
am cb5fc84b: am 16b6a8f7: am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit 'cb5fc84b554aa82a98867f997caffea3d7067033':
More work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 17:10:04 +00:00
Adam Lesinski
95731abeae
am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
...
* commit 'bb7b51978eb5341e9a1204a447c8340bfb248504':
Fix issue with using locally defined attrs in a shared lib
2014-10-01 15:16:02 +00:00
Ruben Brunk
4d9face69e
am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
...
* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
2014-10-01 15:15:14 +00:00
Dianne Hackborn
16b6a8f702
am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
More work on issue #17656716 : Unhandled exception in Window Manager
2014-10-01 15:15:07 +00:00
Adam Lesinski
cd8e73817d
Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
2014-10-01 00:39:57 +00:00
Adam Lesinski
5069dd6989
Fix issue with using locally defined attrs in a shared lib
...
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
2014-09-30 16:18:09 -07:00
Ruben Brunk
b3c802f238
Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
2014-09-30 22:05:48 +00:00
Ruben Brunk
0c79884076
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
...
Bug: 17675571
- All of the mistakes were made. Unmake them.
Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
2014-09-30 13:54:20 -07:00
Dianne Hackborn
ce92b0d070
More work on issue #17656716 : Unhandled exception in Window Manager
...
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
2014-09-30 11:28:18 -07:00
Elliott Hughes
6d4f825143
am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."
...
* commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
Use strerror(3) when reporting zygote failures.
2014-09-30 17:16:27 +00:00
Derek Sollenberger
b4debc6c61
am 713e0683: am 345effc2: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-mr1-dev
...
* commit '713e0683ae72abd70126ace55aa3d3d1223217fc':
Fix memory leak where we close the descriptor instead of the file.
2014-09-30 16:12:51 +00:00
Elliott Hughes
960e83185e
Use strerror(3) when reporting zygote failures.
...
Bug: 17700596
Change-Id: I39a72ab6f19063de3c90c9fccdb749dc9a86324e
2014-09-30 08:49:01 -07:00
Derek Sollenberger
5cb769d999
Fix memory leak where we close the descriptor instead of the file.
...
bug: 17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
2014-09-29 14:12:07 -04:00
jgu21
454a681fc3
am df44f764: am 20867871: Frameworks/base: Early init native bridge
...
* commit 'df44f764444a8676051c54cfb3e3f5fd2b8682c8':
Frameworks/base: Early init native bridge
2014-09-29 04:20:28 +00:00
jgu21
208678718f
Frameworks/base: Early init native bridge
...
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
2014-09-28 15:35:59 -07:00
Ruben Brunk
6c583ef7ea
am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
...
* commit 'c6c331ee6ef9dbcd8e54a1a915d5932a6dda5405':
camera2: Fix native ImageReader test segfaults.
2014-09-27 06:17:06 +00:00
Ruben Brunk
30adb2ca22
am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
...
* commit 'd0f17b986c78f1915f6cf155858b6fd2a9927f23':
camera2: Fix native ImageReader test segfaults.
2014-09-27 05:51:59 +00:00
Ruben Brunk
7b28c66a6c
Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
2014-09-27 02:16:30 +00:00
Ruben Brunk
31798f3318
camera2: Fix native ImageReader test segfaults.
...
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
2014-09-26 18:00:21 -07:00
Dave Burke
b168fa0c6f
am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
...
* commit 'c81f70b65be28493816ebccf23f8df0cd3c51890':
Revert "Fix memory leak where we close the descriptor instead of the file."
2014-09-26 20:53:12 +00:00
Dave Burke
f0e47946a8
am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
...
* commit 'd84ab8b128157d60bc1d4dad6f6223e1f174e188':
Revert "Fix memory leak where we close the descriptor instead of the file."
2014-09-26 19:53:18 +00:00
Dave Burke
6bf7be3b75
Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
2014-09-26 19:33:27 +00:00
Jérôme Poichet
d29c902f98
Revert "Fix memory leak where we close the descriptor instead of the file."
...
This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.
Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
2014-09-26 18:59:11 +00:00
Dianne Hackborn
a15dcc3fa1
am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '6b9b8a03847a190e1f3c9cf50fc3989a572d7534':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 05:04:02 +00:00
Dianne Hackborn
7c1de6c06e
am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 04:41:38 +00:00
Dianne Hackborn
017c6a28be
Work on issue #17656716 : Unhandled exception in Window Manager
...
Create descriptive errors when sending unreasonably large
parcels through IPC.
Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
2014-09-25 17:48:44 -07:00
Dan Albert
e08bd64184
Allow AOSP to boot.
...
HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.
Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
2014-09-25 11:48:11 -07:00
Ruben Brunk
ea06d48527
am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 10:24:12 +00:00
Ruben Brunk
fb444ce6f8
am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-25 10:03:40 +00:00
Derek Sollenberger
13e659cc55
am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
...
* commit '869939a186c610de90d247bc27f26260a26c3daa':
Fix memory leak where we close the descriptor instead of the file.
2014-09-24 22:54:10 +00:00
Mathieu Chartier
4084fe72bb
am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev
...
* commit '890ef76560d34e325b82e1bf72336de8de838844':
Fix dalvik map names
2014-09-24 22:54:05 +00:00
Ruben Brunk
81ba98619b
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
2014-09-24 22:51:55 +00:00