Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | camera: Let #connectLegacy calls through with unspecified HAL version | Igor Murashkin | 2014-06-20 | 1 | -1/+8 | |
* | | | cameraservice: Implement HAL1 and higher HAL API coexistence | Zhijun He | 2014-06-19 | 4 | -27/+126 | |
|/ / | ||||||
* | | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService" | Igor Murashkin | 2014-06-17 | 2 | -23/+145 | |
|\ \ | ||||||
| * | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService | Igor Murashkin | 2014-06-17 | 2 | -23/+145 | |
| |/ | ||||||
* | | CameraService: Fix permissions check issues | Eino-Ville Talvala | 2014-06-17 | 1 | -4/+5 | |
|/ | ||||||
* | 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 "Camera3: Separate the video and preview size filtering" | Zhijun He | 2014-06-10 | 2 | -14/+36 | |
|\ \ | |/ |/| | ||||||
| * | Camera3: Separate the video and preview size filtering | Zhijun He | 2014-06-10 | 2 | -14/+36 | |
* | | am 3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview... | Yin-Chia Yeh | 2014-06-11 | 1 | -0/+4 | |
|\ \ | ||||||
| * | | Camera2: Add null check to createStream | Yin-Chia Yeh | 2014-06-10 | 1 | -0/+4 | |
| |/ | ||||||
* | | resolved conflicts for merge of f285c91e to master | Elliott Hughes | 2014-05-22 | 1 | -2/+2 | |
|\ \ | |/ |/| | ||||||
| * | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf." | Calin Juravle | 2014-05-22 | 1 | -2/+2 | |
| |\ | ||||||
| | * | Move frameworks/av from fdprintf to POSIX dprintf. | Elliott Hughes | 2014-05-22 | 1 | -2/+2 | |
* | | | camera2: Update CameraService for HAL1 shim. | Ruben Brunk | 2014-05-21 | 5 | -89/+295 | |
* | | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry coun... | Eino-Ville Talvala | 2014-05-12 | 1 | -0/+3 | |
|\ \ \ | |/ / | ||||||
| * | | am f02f06c4: Merge "camera: check Intent entry count before reading it" | Eino-Ville Talvala | 2014-05-12 | 1 | -0/+3 | |
| |\ \ | | |/ | ||||||
| | * | Merge "camera: check Intent entry count before reading it" | Eino-Ville Talvala | 2014-05-12 | 1 | -0/+3 | |
| | |\ | ||||||
| | | * | camera: check Intent entry count before reading it | Yuvraj Pasi | 2014-05-12 | 1 | -0/+3 | |
| * | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD | Bill Yi | 2014-04-29 | 5 | -99/+213 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 2 | -44/+121 | |
| | |\ \ | ||||||
| | * \ \ | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | * | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 | |
| | |\ \ \ | ||||||
| | * \ \ \ | am bd3e2e03: camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 1 | -0/+1 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ... | Zhijun He | 2014-03-10 | 1 | -0/+16 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev | Eino-Ville Talvala | 2014-03-07 | 3 | -55/+66 | |
| | |\ \ \ \ \ \ \ | ||||||
* | | \ \ \ \ \ \ \ | Merge "Camera3: fix missing string in logging code" | Zhijun He | 2014-05-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Camera3: fix missing string in logging code | Zhijun He | 2014-05-06 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-05 | 1 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling. | Ruben Brunk | 2014-05-02 | 1 | -1/+14 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge "NULL check in ConnectPro" | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | NULL check in ConnectPro | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 | |
* | | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" | Ruben Brunk | 2014-05-03 | 1 | -14/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-03 | 1 | -14/+1 | |
* | | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-02 | 1 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling. | Ruben Brunk | 2014-05-02 | 1 | -1/+14 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Camera3: Don't notifyError for non-fatal errors | Zhijun He | 2014-05-01 | 1 | -3/+0 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Camera3: scale the max jpeg buffer size based on resolutions | Zhijun He | 2014-04-25 | 2 | -2/+67 | |
* | | | | | | | | | | camera3: Don't hold mLock during flush call | Zhijun He | 2014-04-21 | 1 | -2/+6 | |
* | | | | | | | | | | Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2." | Jianing Wei | 2014-04-21 | 2 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | CameraService: fix waitUntilIdle bug revealed by TestingCamera2. | Jianing Wei | 2014-04-21 | 2 | -4/+7 | |
* | | | | | | | | | | | am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL s... | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream" | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | camera: set mNeedConfig after creating ZSL stream | Yuvraj Pasi | 2014-04-15 | 1 | -0/+2 | |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview... | Igor Murashkin | 2014-03-25 | 2 | -44/+121 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 2 | -44/+121 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-25 | 2 | -44/+121 | |
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | Camera3: block until get an available buffer | Zhijun He | 2014-04-18 | 7 | -22/+103 | |
| |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge "CameraService: fix race condition and wrong last frame number." | Jianing Wei | 2014-04-17 | 2 | -156/+71 | |
|\ \ \ \ \ \ \ \ \ \ |