| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | CameraService: fix race condition and wrong last frame number. | Jianing Wei | 2014-04-17 | 2 | -156/+71 |
| * | | | | | | | | | | | Camera: don't dereference timestamp if it is missing | Zhijun He | 2014-04-14 | 1 | -6/+9 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "camera3: Remove register_stream_buffers for HAL 3.2+" | Vineeta Srivastava | 2014-04-10 | 3 | -2/+78 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | camera3: Remove register_stream_buffers for HAL 3.2+ | Igor Murashkin | 2014-04-09 | 3 | -2/+78 |
| * | | | | | | | | | | | CameraService: trigger appropriate callbacks for burst capture. | Jianing Wei | 2014-04-10 | 23 | -309/+389 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Camera3: fix HAL3.x version check issue | Zhijun He | 2014-03-27 | 5 | -5/+17 |
| * | | | | | | | | | | Revert "camera: Fix setParameters for Preview FPS single/range values" | Eino-Ville Talvala | 2014-03-26 | 1 | -116/+41 |
| * | | | | | | | | | | am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | | CameraService: deadlock fix | Kalle Lampila | 2014-03-25 | 1 | -0/+1 |
| | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | | Merge "Camera3: Fix flush call deadlock" | Zhijun He | 2014-03-25 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Camera3: Fix flush call deadlock | Zhijun He | 2014-03-23 | 2 | -1/+12 |
| * | | | | | | | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus... | Colin Cross | 2014-03-24 | 20 | -70/+80 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| | * | | | | | | | | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | libcameraservice: build 64-bit | Colin Cross | 2014-03-21 | 1 | -1/+0 |
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |