Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface." | Elliott Hughes | 2014-06-12 | 2 | -14/+10 |
|\ | |||||
| * | Switch to a type-safe album art interface. | Elliott Hughes | 2014-06-11 | 2 | -14/+10 |
* | | am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_Medi... | Elliott Hughes | 2014-06-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. | Elliott Hughes | 2014-06-09 | 1 | -1/+1 |
* | | am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." | Elliott Hughes | 2014-06-05 | 1 | -6/+7 |
|\ \ | |/ | |||||
| * | [LP64] Fix access to MediaAlbumArt. | Elliott Hughes | 2014-06-05 | 1 | -6/+7 |
* | | am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name... | Mike Lockwood | 2014-06-02 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | 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 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getO... | Mike Lockwood | 2014-06-02 | 1 | -4/+2 |
|\ \ \ | |/ / | |||||
| * | | 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 a034dac7: android_media_MediaMuxer_setLocation: amended signature. | Robert Shih | 2014-05-30 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | android_media_MediaMuxer_setLocation: amended signature. | Robert Shih | 2014-05-30 | 1 | -1/+1 |
* | | | | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." | Ying Wang | 2014-05-08 | 1 | -2/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avo... | Marco Nelissen | 2014-05-01 | 1 | -0/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ... | Narayan Kamath | 2014-04-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
* | | | | | | | | | | am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp... | Jeff Tinker | 2014-04-21 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev | Jeff Tinker | 2014-04-21 | 2 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Allow DRM plugins to be destroyed when released | Jeff Tinker | 2014-04-11 | 2 | -2/+10 |
* | | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 |
| | * | | | | | | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify. | Elliott Hughes | 2014-03-07 | 1 | -0/+1 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | frameworks: 64 bit compile issues | Mark Salyzyn | 2014-04-16 | 2 | -10/+13 |
* | | | | | | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 2 | -34/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ... | Jeff Tinker | 2014-04-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Add signature|system permission to MediaDrm signer APIs | Jeff Tinker | 2014-04-02 | 1 | -4/+4 |
* | | | | | | | | | am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu... | Jeff Tinker | 2014-04-01 | 1 | -17/+109 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-04-01 | 1 | -17/+109 |
* | | | | | | | | | am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" | Narayan Kamath | 2014-03-31 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | 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 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" | Mark Salyzyn | 2014-03-26 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |