| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | Fix MediaFocusControl index management for PlayerRecord | Jean-Michel Trivi | 2014-04-30 | 1 | -7/+13 | |
| * | | | | | | | | am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t p... | Narayan Kamath | 2014-04-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | ||||||
| | * | | | | | | 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 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE" | Glenn Kasten | 2014-04-29 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE | Glenn Kasten | 2014-04-15 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 3ce4f3d0 to master | Elliott Hughes | 2014-04-28 | 1 | -4/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | Merge "ImageReader: remove RAW_SENSOR format translation" | Zhijun He | 2014-04-25 | 1 | -7/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | ImageReader: remove RAW_SENSOR format translation | Zhijun He | 2014-04-24 | 1 | -7/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resour... | Marco Nelissen | 2014-04-25 | 1 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "camera2: Add DNG creator class." | Ruben Brunk | 2014-04-25 | 1 | -0/+254 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | camera2: Add DNG creator class. | Ruben Brunk | 2014-04-24 | 1 | -0/+254 | |
| | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | camera2: Fix broken camera metadata test due to key rename | Igor Murashkin | 2014-04-22 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Remove VideoEditor" | Lajos Molnar | 2014-04-22 | 51 | -33643/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Remove VideoEditor | Lajos Molnar | 2014-04-21 | 51 | -33643/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | PlayerRecord: remove obsolete accessors | Jean-Michel Trivi | 2014-04-22 | 1 | -12/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "MediaFocusControl: priority to playing players for media button" | Jean-Michel Trivi | 2014-04-22 | 2 | -95/+134 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | MediaFocusControl: priority to playing players for media button | Jean-Michel Trivi | 2014-04-22 | 2 | -95/+134 | |
| * | | | | | | | | | | | | | | | | | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when relea... | Jeff Tinker | 2014-04-21 | 2 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | 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 f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail | Mike Lockwood | 2014-04-21 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am 3c8bbe24: Check that mRemotePlayer is not null before use | Simon Wilson | 2014-04-17 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |