| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 9 | -72/+131 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." | Glenn Kasten | 2014-03-19 | 1 | -1/+0 |
| | | |\ \ \ | |||||
| | | * \ \ \ | am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in Media... | Lajos Molnar | 2014-03-19 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev | Marco Nelissen | 2014-03-14 | 2 | -0/+46 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passe... | Zhihai Xu | 2014-03-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | 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 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ... | Marco Nelissen | 2014-03-07 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into kl... | Leon Scroggins III | 2014-03-07 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" | Narayan Kamath | 2014-03-07 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acqui... | Zhijun He | 2014-03-07 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i... | Eric Laurent | 2014-03-06 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Track libcore.os' move to android.system. | Elliott Hughes | 2014-04-28 | 1 | -4/+3 |
| * | | | | | | | | | | | | | | | | | am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Merge "Release DrmManagerClient resources" | Marco Nelissen | 2014-04-25 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | Release DrmManagerClient resources | Mattias Nilsson | 2014-04-15 | 1 | -0/+13 |
| * | | | | | | | | | | | | | | | | | | 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 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | am 3c8bbe24: Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | 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 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o... | Elliott Hughes | 2014-04-11 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Merge "generateProjectThumbnail can fail to close output stream" | Elliott Hughes | 2014-04-11 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | generateProjectThumbnail can fail to close output stream | Henrik Baard | 2013-07-11 | 1 | -3/+5 |
| * | | | | | | | | | | | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ... | Jeff Tinker | 2014-04-03 | 3 | -42/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Add signature|system permission to MediaDrm signer APIs | Jeff Tinker | 2014-04-02 | 3 | -42/+37 |
| * | | | | | | | | | | | | | | | | | | am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modu... | Jeff Tinker | 2014-04-01 | 11 | -26/+490 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-04-01 | 11 | -26/+490 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |