Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Camera2/3: Don't release recording buffer when stream is active" | Zhijun He | 2014-06-20 | 1 | -4/+7 |
|\ | |||||
| * | Camera2/3: Don't release recording buffer when stream is active | Zhijun He | 2014-06-18 | 1 | -4/+7 |
* | | libcameraservice: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 1 | -2/+2 |
* | | audiopolicy: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 1 | -9/+9 |
* | | Merge "libnbaio: 64-bit compile warnings" | Mark Salyzyn | 2014-06-20 | 2 | -3/+5 |
|\ \ | |||||
| * | | libnbaio: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 2 | -3/+5 |
* | | | Merge "libmediaplayerservice: 64-bit compile warnings" | Mark Salyzyn | 2014-06-20 | 3 | -10/+10 |
|\ \ \ | |/ / | |||||
| * | | libmediaplayerservice: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 3 | -10/+10 |
* | | | Merge "Fix Externally reported security issue" | Jeff Tinker | 2014-06-20 | 1 | -1/+12 |
|\ \ \ | |||||
| * | | | Fix Externally reported security issue | Jeff Tinker | 2014-06-20 | 1 | -1/+12 |
* | | | | am 7f76c502: (-s ours) am 06508824: am f0d8468d: DO NOT MERGE: CameraService:... | Eino-Ville Talvala | 2014-06-20 | 0 | -0/+0 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | am 06508824: am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check ... | Eino-Ville Talvala | 2014-06-20 | 1 | -4/+5 |
| |\ \ \ | |||||
| | * \ \ | am f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues | Eino-Ville Talvala | 2014-06-19 | 1 | -4/+5 |
| | |\ \ \ | |||||
| | | * | | | DO NOT MERGE: CameraService: Fix permissions check issues | Eino-Ville Talvala | 2014-06-17 | 1 | -4/+5 |
* | | | | | | Merge "camera: Let #connectLegacy calls through with unspecified HAL version" | Igor Murashkin | 2014-06-20 | 1 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | camera: Let #connectLegacy calls through with unspecified HAL version | Igor Murashkin | 2014-06-20 | 1 | -1/+8 |
* | | | | | | | Merge "Extract out test utility functions from resampler_tests" | Andy Hung | 2014-06-20 | 3 | -202/+322 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Extract out test utility functions from resampler_tests | Andy Hung | 2014-06-18 | 3 | -202/+322 |
* | | | | | | | | libmedia: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 12 | -58/+76 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge "cameraservice: Implement HAL1 and higher HAL API coexistence" | Zhijun He | 2014-06-19 | 8 | -27/+217 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cameraservice: Implement HAL1 and higher HAL API coexistence | Zhijun He | 2014-06-19 | 8 | -27/+217 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | screenrecord: 64-bit compile warnings | Mark Salyzyn | 2014-06-19 | 3 | -20/+22 |
|/ / / / / / | |||||
* | | | | | | AudioTrack: add support for compressed audio | Eric Laurent | 2014-06-19 | 7 | -31/+95 |
* | | | | | | Merge changes I0fef0584,I322b91fa | Jean-Michel Trivi | 2014-06-18 | 11 | -20/+438 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | AudioPolicyManager: return output for audio attributes | Jean-Michel Trivi | 2014-06-18 | 10 | -13/+271 |
| * | | | | | AudioTrack construction with audio attributes | Jean-Michel Trivi | 2014-06-17 | 2 | -11/+171 |
* | | | | | | Merge "Fail more gracefully on allocation failure" | Marco Nelissen | 2014-06-17 | 1 | -7/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fail more gracefully on allocation failure | Marco Nelissen | 2014-06-17 | 1 | -7/+26 |
* | | | | | | | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService" | Igor Murashkin | 2014-06-17 | 4 | -23/+224 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService | Igor Murashkin | 2014-06-17 | 4 | -23/+224 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | CameraService: Fix permissions check issues | Eino-Ville Talvala | 2014-06-17 | 1 | -4/+5 |
|/ / / / / / | |||||
* | | | | | | Merge "Fix logging" | Marco Nelissen | 2014-06-16 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix logging | Marco Nelissen | 2014-06-13 | 1 | -4/+4 |
* | | | | | | am a3603693: Merge "Fix deadlock" into lmp-preview-dev | Glenn Kasten | 2014-06-16 | 1 | -5/+8 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge "Fix deadlock" into lmp-preview-dev | Glenn Kasten | 2014-06-16 | 1 | -5/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix deadlock | Glenn Kasten | 2014-06-16 | 1 | -5/+8 |
* | | | | | | | | Merge "camera2: Add jpeg sizes to legacy mode static characteristics." | Ruben Brunk | 2014-06-16 | 1 | -9/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | camera2: Add jpeg sizes to legacy mode static characteristics. | Ruben Brunk | 2014-06-12 | 1 | -9/+20 |
* | | | | | | | | | Merge "support for CEA-608 closed caption" | Chong Zhang | 2014-06-14 | 7 | -3/+384 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | support for CEA-608 closed caption | Chong Zhang | 2014-06-13 | 7 | -3/+384 |
* | | | | | | | | | | Merge "refactor getTrackInfo()" | Chong Zhang | 2014-06-12 | 11 | -65/+155 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | refactor getTrackInfo() | Chong Zhang | 2014-06-13 | 11 | -65/+155 |
* | | | | | | | | | Merge "AudioSystem: remove unused stream type" | Jean-Michel Trivi | 2014-06-12 | 3 | -19/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | AudioSystem: remove unused stream type | Jean-Michel Trivi | 2014-06-11 | 3 | -19/+11 |
* | | | | | | | | | | am 3bcffa13: force command flush after releasing a reference to shared memory | Eric Laurent | 2014-06-13 | 3 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | force command flush after releasing a reference to shared memory | Eric Laurent | 2014-06-13 | 3 | -4/+10 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]." | Elliott Hughes | 2014-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | am ccaffa8d: Merge "Use char x[] rather than char x[0]." | Elliott Hughes | 2014-06-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge "Use char x[] rather than char x[0]." | Elliott Hughes | 2014-06-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Use char x[] rather than char x[0]. | Elliott Hughes | 2014-06-12 | 1 | -1/+1 |