| Commit message (Expand) | Author | Age | Files | Lines |
* | am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." | Mike Lockwood | 2014-06-02 | 1 | -1/+1 |
|\ |
|
| * | MtpDatabase JNI: Fixed incorrect method name in ALOGE. | Martin Blumenstingl | 2014-05-31 | 1 | -1/+1 |
* | | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty... | Mike Lockwood | 2014-06-02 | 1 | -4/+2 |
|\ \
| |/ |
|
| * | MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue(). | Martin Blumenstingl | 2014-05-31 | 1 | -4/+2 |
* | | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." | Ying Wang | 2014-05-08 | 1 | -2/+0 |
|\ \
| |/ |
|
| * | Remove unused LOCAL_LDLIBS. | Ying Wang | 2014-05-07 | 1 | -2/+0 |
* | | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ... | Marco Nelissen | 2014-05-01 | 1 | -0/+7 |
|\ \
| |/ |
|
| * | Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." | Marco Nelissen | 2014-05-01 | 1 | -0/+7 |
| |\ |
|
| | * | MetadataRetriever: Check null pointer to avoid tombstone crash. | wang, biao | 2014-04-09 | 1 | -0/+7 |
* | | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint" | Narayan Kamath | 2014-04-30 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | Merge "Cast CallVoidMethod's size_t parameters to jint" | Narayan Kamath | 2014-04-30 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Cast CallVoidMethod's size_t parameters to jint | Ashok Bhat | 2014-03-06 | 1 | -1/+1 |
* | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD | Bill Yi | 2014-04-29 | 2 | -34/+46 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." | Glenn Kasten | 2014-03-19 | 1 | -1/+0 |
| |\ \ \ |
|
| * \ \ \ | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" | Narayan Kamath | 2014-03-11 | 1 | -3/+3 |
| |\ \ \ \ |
|
| * \ \ \ \ | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u... | Narayan Kamath | 2014-03-11 | 1 | -3/+3 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj... | Marco Nelissen | 2014-03-08 | 2 | -34/+46 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Make MtpDatabase use libexif instead of libjhead | Marco Nelissen | 2014-03-07 | 2 | -34/+46 |
| * | | | | | | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| | | | | | / /
| | |_|_|_|/ /
| |/| | | | | |
|
| | * | | | | | libexif is now libjhead | Marco Nelissen | 2014-03-06 | 1 | -2/+2 |
* | | | | | | | frameworks: 64 bit compile issues | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
* | | | | | | | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
| |_|_|_|_|/
|/| | | | | |
|
* | | | | | | Merge "Cast CallMethod's size_t parameters to jint" | Narayan Kamath | 2014-03-31 | 1 | -2/+2 |
|\ \ \ \ \ \ |
|
| * | | | | | | Cast CallMethod's size_t parameters to jint | Ashok Bhat | 2014-03-25 | 1 | -2/+2 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | jni: 64-bit compile issue | Mark Salyzyn | 2014-03-26 | 1 | -5/+6 |
|/ / / / / |
|
* | | | | | mediaeditor shouldn't depend on audioflinger. | Narayan Kamath | 2014-03-19 | 1 | -1/+0 |
| |_|_|/
|/| | | |
|
* | | | | Merge "Don't assume that size_t is 32-bit" | Narayan Kamath | 2014-03-07 | 1 | -3/+3 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Don't assume that size_t is 32-bit | Ashok Bhat | 2014-03-06 | 1 | -3/+3 |
| |/ / |
|
* | | | Don't use size_t for variables that store uint32_t value | Ashok Bhat | 2014-03-06 | 1 | -3/+3 |
|/ / |
|
* | | Fix in MediaMuxer's JNI code | Ashok Bhat | 2014-02-07 | 1 | -2/+2 |
* | | Merge "Release locked buffer when it fails to acquire graphics buffer" | Zhijun He | 2014-01-30 | 1 | -0/+1 |
|\ \ |
|
| * | | Release locked buffer when it fails to acquire graphics buffer | lina.x.pi | 2014-01-28 | 1 | -0/+1 |
* | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 1 | -2/+2 |
|/ / |
|
* | | AArch64: Use long for pointers in media classes | Ashok Bhat | 2014-01-15 | 9 | -128/+132 |
* | | Merge "Add NULL check in updateProxyConfig" | Marco Nelissen | 2014-01-14 | 1 | -8/+11 |
|\ \ |
|
| * | | Add NULL check in updateProxyConfig | Oscar Rydhé | 2013-12-19 | 1 | -8/+11 |
* | | | Merge "Fix a JNI local reference leak in MediaDrm" | Jason Sams | 2014-01-11 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Fix a JNI local reference leak in MediaDrm | Patrik2 Carlsson | 2013-12-19 | 1 | -0/+1 |
| |/ / |
|
* | | | AArch64: Use long for pointers in MTP classes | Ashok Bhat | 2014-01-07 | 3 | -24/+25 |
* | | | AArch64: Use long for pointers in VideoEditor classes | Ashok Bhat | 2014-01-07 | 2 | -36/+36 |
* | | | AArch64: Use long for pointers in audio effect classes | Ashok Bhat | 2014-01-07 | 2 | -53/+61 |
* | | | AArch64: Use long for pointers in AmrInputStream | Ashok Bhat | 2014-01-07 | 1 | -14/+14 |
* | | | Merge "MediaDrm#mNativeContext is a long, not int." | Narayan Kamath | 2013-12-19 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | MediaDrm#mNativeContext is a long, not int. | Narayan Kamath | 2013-12-18 | 1 | -1/+1 |
* | | | Remove unused field from MediaMuxer | Narayan Kamath | 2013-12-18 | 1 | -7/+0 |
|/ / |
|
* | | AArch64: Use long for pointers in MediaDrm and MediaMuxer | Ashok Bhat | 2013-12-10 | 2 | -18/+18 |
* | | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD | The Android Open Source Project | 2013-11-22 | 22 | -176/+1248 |
|\ \
| |/ |
|
| * | Fix hang | Marco Nelissen | 2013-09-25 | 1 | -1/+1 |
| * | Add audio level monitoring capabilities in Visualizer effect | Jean-Michel Trivi | 2013-09-23 | 1 | -0/+72 |
| * | ImageReader: disable NV21 support | Zhijun He | 2013-09-18 | 1 | -3/+8 |