Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Adds a TransportController and TransportPerformer to session" | RoboErik | 2014-03-12 | 15 | -209/+2380 |
|\ | |||||
| * | Adds a TransportController and TransportPerformer to session | RoboErik | 2014-03-12 | 15 | -209/+2380 |
* | | Merge "MTP: Add support for battery level device property" | Mike Lockwood | 2014-03-12 | 4 | -58/+147 |
|\ \ | |/ |/| | |||||
| * | MTP: Add support for battery level device property | Mike Lockwood | 2014-03-12 | 4 | -58/+147 |
* | | Merge "AudioTrack write method with data in ByteBuffer" | Jean-Michel Trivi | 2014-03-11 | 1 | -2/+103 |
|\ \ | |||||
| * | | AudioTrack write method with data in ByteBuffer | Jean-Michel Trivi | 2014-03-11 | 1 | -2/+103 |
* | | | MediaPlayer: fix int overflow issue in MediaTimeProvider | Lajos Molnar | 2014-03-10 | 1 | -1/+1 |
* | | | Merge "MediaMuxer: added WebM filetype; open output file RW." | Robert Shih | 2014-03-10 | 1 | -10/+11 |
|\ \ \ | |||||
| * | | | MediaMuxer: added WebM filetype; open output file RW. | Robert Shih | 2014-01-29 | 1 | -10/+11 |
* | | | | am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that... | Narayan Kamath | 2014-03-07 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" | Narayan Kamath | 2014-03-07 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | 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 |
* | | | | | | | am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t ... | Narayan Kamath | 2014-03-07 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u... | Narayan Kamath | 2014-03-07 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Don't use size_t for variables that store uint32_t value | Ashok Bhat | 2014-03-06 | 1 | -3/+3 |
| | |/ / / | |||||
| * | | | | am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load f... | Marco Nelissen | 2014-03-07 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ... | Marco Nelissen | 2014-03-07 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | ExifInterface: fix class load failure | Zhijun He | 2014-03-06 | 1 | -1/+1 |
* | | | | | | | Fix build | Marco Nelissen | 2014-03-06 | 1 | -0/+1 |
* | | | | | | | am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libex... | Marco Nelissen | 2014-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into k... | Marco Nelissen | 2014-03-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | 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 |
| | | * | | | | Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Update framework to use M33 Skia. DO NOT MERGE | Leon Scroggins III | 2014-03-06 | 1 | -2/+2 |
| * | | | | | | | am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchroniz... | Eric Laurent | 2014-03-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" i... | Eric Laurent | 2014-03-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Fix RemoteController synchronization mode | Jean-Michel Trivi | 2014-03-06 | 1 | -1/+1 |
| | | |/ / / / | |||||
* | | | | | | | fix MediaCodec release deadlock and resource leak | Chong Zhang | 2014-03-03 | 2 | -1/+31 |
* | | | | | | | Merge "Fix includes so that they no longer rely on the global Skia includes d... | Derek Sollenberger | 2014-02-28 | 4 | -5/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix includes so that they no longer rely on the global Skia includes director... | Derek Sollenberger | 2014-02-27 | 4 | -5/+3 |
* | | | | | | | | Cleanup unnecessary includes for libskia. | Derek Sollenberger | 2014-02-27 | 1 | -5/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Move Session apis to android.media.session" | RoboErik | 2014-02-26 | 10 | -15/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move Session apis to android.media.session | RoboErik | 2014-02-25 | 10 | -15/+24 |
* | | | | | | | | Merge "Tabs -> spaces in frameworks/base." | John Spurlock | 2014-02-25 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Tabs -> spaces in frameworks/base. | John Spurlock | 2014-02-25 | 1 | -6/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "support time lapse/slow motion on SURFACE source" | Chong Zhang | 2014-02-24 | 2 | -6/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | support time lapse/slow motion on SURFACE source | Chong Zhang | 2014-02-14 | 2 | -6/+47 |
* | | | | | | | | | Add method to get redirected Uri | Marco Nelissen | 2014-02-21 | 2 | -7/+19 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Another javadoc fix | RoboErik | 2014-02-19 | 1 | -2/+2 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Fix build (bad javadoc reference) | RoboErik | 2014-02-19 | 1 | -1/+1 |
* | | | | | | | Merge "Initial round of MediaSession APIs" | RoboErik | 2014-02-20 | 12 | -35/+1002 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Initial round of MediaSession APIs | RoboErik | 2014-02-19 | 12 | -35/+1002 |
| * | | | | | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." | Andreas Huber | 2014-02-13 | 2 | -2/+0 |
| * | | | | | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. | Andreas Huber | 2014-02-12 | 2 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | Fix regression | Marco Nelissen | 2014-02-18 | 1 | -1/+1 |
* | | | | | | | Update createInputSurface() doc | Andy McFadden | 2014-02-14 | 1 | -0/+4 |
|/ / / / / / | |||||
* | | | | | | am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" | Narayan Kamath | 2014-02-11 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" | Narayan Kamath | 2014-02-11 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | |