summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...Alan Viverette2014-10-311-3/+7
|\
| * Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-3/+7
* | am 96c39e4c: am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak."...Eric Laurent2014-10-311-3/+6
|\ \ | |/
| * Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-devEric Laurent2014-10-291-3/+6
| |\
| | * SoundTrigger JNI: fix local reference leak.Eric Laurent2014-10-291-3/+6
* | | am 8f53ad8e: am 7ef46316: Merge "Condense AndroidRuntime init log, include ui...Dianne Hackborn2014-10-301-2/+2
|\ \ \ | |/ /
| * | Merge "Condense AndroidRuntime init log, include uid running under." into lmp...Dianne Hackborn2014-10-291-2/+2
| |\ \
| | * | Condense AndroidRuntime init log, include uid running under.Dianne Hackborn2014-10-291-2/+2
| * | | Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1...Vladimir Marko2014-10-291-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix android_media_AudioSystem_getMasterMute return type.Vladimir Marko2014-10-291-1/+1
| | |/
* | | am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private d...Calin Juravle2014-10-301-4/+0
|\ \ \ | |/ /
| * | Use native brige only if we have a private data directory.Calin Juravle2014-10-291-4/+8
* | | resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp.Calin Juravle2014-10-301-0/+4
|\ \ \ | |/ /
| * | PreInitializeNativeBridge only if its AvailableCalin Juravle2014-10-291-14/+14
| * | Fix the length of a profiler system propertyWei Jin2014-10-291-1/+1
| |/
* | am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute ...Vladimir Marko2014-10-291-1/+1
|\ \
| * \ 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 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private d...Calin Juravle2014-10-291-4/+8
|\ \ \ \ | |/ / /
| * | | 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 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Availa...Calin Juravle2014-10-291-13/+13
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ | | |/ /
| * | | am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...Elliott Hughes2014-10-183-0/+65
| |\ \ \
| * \ \ \ am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation wi...Neil Fuller2014-10-163-65/+0
| |\ \ \ \
| * \ \ \ \ am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-devMathieu Chartier2014-10-061-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-devJohn 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...Adam Lesinski2014-10-011-4/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failur...Elliott Hughes2014-09-301-16/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffer...Ruben Brunk2014-09-301-13/+10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-09-301-11/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp...Ruben Brunk2014-09-271-39/+72
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor ins...Dave Burke2014-09-261-11/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-241-8/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-241-11/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c37e905a: Merge "Fix memory leak where we close the descriptor instead of ...Derek Sollenberger2014-09-241-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a061388d: Merge "Fix dalvik map names" into lmp-devMathieu Chartier2014-09-241-16/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 337f4b98: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" in...Eric Laurent2014-09-241-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."Christopher Ferris2014-09-201-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it i...Mike Lockwood2014-09-191-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples"...Jorim Jaggi2014-09-161-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" in...John Reck2014-10-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Add some free zoom to lockHardwareCanvasJohn Reck2014-10-231-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | am e8556de6: am 36960fad: Merge "Decoder only returns true on complete succes...Leon Scroggins III2014-10-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /