Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ndk: 64-bit compile warnings | Mark Salyzyn | 2014-06-26 | 3 | -9/+12 |
* | libstagefright: 64-bit compile warnings | Mark Salyzyn | 2014-06-26 | 28 | -136/+170 |
* | Merge "cameraservice: Deprecate triggerId tags" | Yin-Chia Yeh | 2014-06-25 | 3 | -28/+42 |
|\ | |||||
| * | cameraservice: Deprecate triggerId tags | Yin-Chia Yeh | 2014-06-24 | 3 | -28/+42 |
* | | mtp: 64-bit compile warnings | Mark Salyzyn | 2014-06-25 | 2 | -5/+8 |
* | | Merge "GLConsumer: Stop using default constructor params" | Dan Stoza | 2014-06-25 | 3 | -3/+5 |
|\ \ | |||||
| * | | GLConsumer: Stop using default constructor params | Dan Stoza | 2014-06-24 | 3 | -3/+5 |
* | | | Merge "audio policy: fix several issues on routing APIs." | Eric Laurent | 2014-06-25 | 1 | -12/+30 |
|\ \ \ | |||||
| * | | | audio policy: fix several issues on routing APIs. | Eric Laurent | 2014-06-24 | 1 | -12/+30 |
| | |/ | |/| | |||||
* | | | Merge "Use sp<> instead of raw pointer for FastMixer" | Glenn Kasten | 2014-06-24 | 2 | -12/+10 |
|\ \ \ | |||||
| * | | | Use sp<> instead of raw pointer for FastMixer | Glenn Kasten | 2014-06-24 | 2 | -12/+10 |
* | | | | am 32f212ea: (-s ours) am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "D... | Lajos Molnar | 2014-06-24 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW... | Lajos Molnar | 2014-06-24 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX prof... | Lajos Molnar | 2014-06-24 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query" | Lajos Molnar | 2014-06-24 | 1 | -3/+4 |
| | | |\ \ \ \ | | |/ / / / / | |||||
| | | * | | | | DO NOT MERGE: Fix for SW video decoder OMX profile/level query | Xiaosong Wei | 2014-06-24 | 1 | -3/+4 |
| | |/ / / / | |||||
* | | | | | | am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warni... | Mark Salyzyn | 2014-06-24 | 4 | -29/+29 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 940c688d: Merge "libmediaplayerservice: unused argument warning messages" | Mark Salyzyn | 2014-06-24 | 4 | -29/+29 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "libmediaplayerservice: unused argument warning messages" | Mark Salyzyn | 2014-06-23 | 4 | -29/+29 |
| | |\ \ \ \ | |||||
| | | * | | | | libmediaplayerservice: unused argument warning messages | Mark Salyzyn | 2014-06-24 | 4 | -29/+29 |
| | |/ / / / | |||||
* | | | | | | Merge "Improve MTP error checking" | Marco Nelissen | 2014-06-24 | 1 | -23/+42 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Improve MTP error checking | Marco Nelissen | 2014-06-24 | 1 | -23/+42 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "Camera: Clear ZSL buffer queue when jpeg size is changed" | Zhijun He | 2014-06-23 | 1 | -0/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Camera: Clear ZSL buffer queue when jpeg size is changed | Zhijun He | 2014-06-23 | 1 | -0/+17 |
| | |_|/ | |/| | | |||||
* | | | | am 620f348f: am da69fdbb: Merge "Fix buffer allocation" | Marco Nelissen | 2014-06-23 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am da69fdbb: Merge "Fix buffer allocation" | Marco Nelissen | 2014-06-23 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge "Fix buffer allocation" | Marco Nelissen | 2014-06-20 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fix buffer allocation | Marco Nelissen | 2014-06-23 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Merge "Parse trex and mehd boxes" | Marco Nelissen | 2014-06-23 | 4 | -16/+141 |
|\ \ \ \ | |||||
| * | | | | Parse trex and mehd boxes | Marco Nelissen | 2014-06-23 | 4 | -16/+141 |
* | | | | | Merge "Add test-mixer AudioMixer test program" | Andy Hung | 2014-06-23 | 3 | -0/+458 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add test-mixer AudioMixer test program | Andy Hung | 2014-06-20 | 3 | -0/+458 |
* | | | | | Camera2: get stream configs by device verison | Yin-Chia Yeh | 2014-06-20 | 9 | -82/+231 |
* | | | | | Merge "libeffects: 64-bit compile warnings" | Mark Salyzyn | 2014-06-20 | 2 | -26/+32 |
|\ \ \ \ \ | |||||
| * | | | | | libeffects: 64-bit compile warnings | Mark Salyzyn | 2014-06-20 | 2 | -26/+32 |
* | | | | | | Merge "Camera2: Fix lastFrameNumber counter in flush case" | Yin-Chia Yeh | 2014-06-20 | 2 | -0/+26 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Camera2: Fix lastFrameNumber counter in flush case | Yin-Chia Yeh | 2014-06-20 | 2 | -0/+26 |
* | | | | | | 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 |
| | |\ \ \ \ \ \ |