summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "kill HAVE_INOTIFY"Yabin Cui2014-11-111-27/+23
|\
| * kill HAVE_INOTIFYYabin Cui2014-11-101-27/+23
* | Merge "kill HAVE_SCHED_SETSCHEDULER"Yabin Cui2014-11-101-1/+2
|\ \
| * | kill HAVE_SCHED_SETSCHEDULERYabin Cui2014-11-101-1/+2
| |/
* | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-11-101-4/+15
|/
* am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."Vladimir Marko2014-10-291-1/+1
|\
| * Fix android_media_AudioSystem_getMasterMute return type.Vladimir Marko2014-10-291-1/+1
* | am 43a92646: Merge "Use native brige only if we have a private data directory."Calin Juravle2014-10-291-4/+8
|\ \ | |/
| * Use native brige only if we have a private data directory.Calin Juravle2014-10-291-4/+8
* | am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"Calin Juravle2014-10-281-13/+13
|\ \ | |/
| * PreInitializeNativeBridge only if its AvailableCalin Juravle2014-10-271-13/+13
* | am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-203-65/+0
|\ \ | |/
| * Replacing FloatMath native implementation with calls to MathNick Kralevich2014-10-203-65/+0
* | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...Elliott Hughes2014-10-183-0/+65
|\ \
| * \ 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
* | | | am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-163-65/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-devMathieu Chartier2014-10-061-4/+4
|\ \ \
| * | | Fix incorrect JNI_ABORTMathieu Chartier2014-10-061-4/+4
* | | | am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn Reck2014-10-031-8/+0
|\ \ \ \ | |/ / /
| * | | Cleanup DeferredLayerUpdaterJohn Reck2014-10-031-8/+0
* | | | am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...Adam Powell2014-10-011-23/+4
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" i...Adam Powell2014-10-011-23/+4
| |\ \ \
| | * | | Revert "Fix issue with using locally defined attrs in a shared lib"Adam Powell2014-10-011-23/+4
* | | | | am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...Adam Lesinski2014-10-011-4/+23
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failur...Elliott Hughes2014-09-301-16/+17
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Use strerror(3) when reporting zygote failures.Elliott Hughes2014-09-301-16/+17
| | |_|/ | |/| |
| * | | Allow AOSP to boot.Dan Albert2014-09-251-3/+0
* | | | am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffer...Ruben Brunk2014-09-301-13/+10
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| | | |/ | | |/|
* | | | am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-09-301-11/+6
|\ \ \ \ | |/ / /
| * | | More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-301-11/+6
| |/ /
| * | Frameworks/base: Early init native bridgejgu212014-09-281-11/+35
* | | am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp...Ruben Brunk2014-09-271-39/+72
|\ \ \ | |/ /
| * | 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
* | | | am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor ins...Dave Burke2014-09-261-11/+5
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Fix memory leak where we close the descriptor instead of the f...Dave Burke2014-09-261-11/+5
| |\ \ \
| | * | | Revert "Fix memory leak where we close the descriptor instead of the file."Jérôme Poichet2014-09-261-11/+5
* | | | | am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-251-1/+1
* | | | | am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-241-8/+17
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-241-11/+35
|\ \ \ \ \ | | |_|_|/ | |/| | |