summaryrefslogtreecommitdiffstats
path: root/camera/CameraBase.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Make CameraStatus::cameraId to use String16.Oleksiy Vyalov2017-03-241-4/+6
| | | | | | | | | | | | Java strings are passed as UTF16 and attempt to pass cameraId with alpha symbols via CameraStatus leads either to corrupted or null strings. Test: build/flash/boot Test: verified together with ag/1841664 that alpha camera ids are passed correctly. Change-Id: Ic6045322137c156aa03bbcdccfe81f8f0ecb0618
* CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 ↵Eino-Ville Talvala2017-02-031-3/+3
|\ | | | | | | | | | | | | | | am: 6cb1912505 am: 4f95157295 am: 7376ce23ad am: 43605e237f Change-Id: I35d434f0efc0cc77f7dc839c554fd164ae0ec4e4
| * CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 ↵Eino-Ville Talvala2017-02-021-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | am: 6cb1912505 am: 4f95157295 Change-Id: I31c70615f0b81da32ebbd2262b262a9024e114dc
| | * CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1Eino-Ville Talvala2017-02-021-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | am: 6cb1912505 Change-Id: If68d75e176ef8c2fafe2288307a0b0e724c3f826
| | | * CameraBase: Don't return an sp<> by referenceEino-Ville Talvala2017-02-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the server dies, the binder death callback clears out the global camera service sp<>, and any current references to it will become quite unhappy. Test: Camera CTS passes Bug: 31992879 Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348
* | | | Camera service: Updates in preparation for HIDLEino-Ville Talvala2016-12-131-20/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - For all camera2 paths, and anything shared between the legacy API and camera2, switch to using strings for camera IDs - Update ICameraService.addListener to return current set of known devices and their status, to allow for immediate return of camera devices when first connecting to camera service - Remove unused code path for getCameraCharacteristics with HALv1 - Add namespace qualifiers to Binder objects that are also used by hardware binder. - Switch to using new HIDL DeviceStatus and TorchStatus enumerations for better type safety in the service; map more clearly between the HAL, service-internal, and Binder enums. Test: cts-tradefed run cts -m Camera --skip-connectivity-check -d -o --abi armeabi-v7a --disable-reboot Bug: 32991422 Change-Id: I765951d9a21000a8432bed9aa0e3604709daa4b1
* | | Merge "Log correct reason for camera connect failures"Treehugger Robot2016-12-081-1/+1
|\ \ \ | |/ / |/| |
| * | Log correct reason for camera connect failuresTobias Lindskog2016-12-061-1/+1
| |/ | | | | | | | | | | | | | | Show the detailed error when we have it, rather than trying to show it only when we don't. Bug: 33358375 Change-Id: Ifa7a4f8de7b35a0379224efd1e27d6745844b853
* / Don't try to connect camera service if it is disabled.Ivan Podogov2016-09-161-0/+7
|/ | | | | | | | | | | | On Android Wear devices we don't have cameras, so we don't need the proxy service as well. If it is disabled by the system property, don't wait for it to start, but rather return null pointer in getCameraService(), which causes getNumberOfCameras() to report zero cameras available. The same logic applies to ACameraManager, where we return an empty list. Bug: 28560707 Change-Id: I4c0bc29f061f1b66710c8188a7916bfaf089d23f
* Camera: Clean up warnings and set -WerrorEino-Ville Talvala2016-03-021-1/+0
| | | | | | | | | - Also fix error logging template inconsistency - Also add a few error handling cases into camera2 NDK to deal with previously-ignored error codes Bug: 27149500 Change-Id: I8f1f4c72252dd48d652f24b595b642199f20c327
* Camera: Switch camera2 to auto-gen C++ binder interfacesEino-Ville Talvala2016-03-021-21/+56
| | | | | | | | | | | | | - Move camera service AIDL files to frameworks/av - Build C++ interface stubs with AIDL tools - Add necessary native-side parcelables and update existing ones - Remove manually-written stubs, rearrange remaining manual stubs - Adjust implementations to work with auto-generated stubs - Adjust method signatures for auto-gen differences - Add rich error messages using binder::Status Bug: 25091611 Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
* Camera: Fix client permission checkChien-Yu Chen2016-01-251-2/+2
| | | | | | | | | | | | Modify StageFright's CameraSource to forward calling PID as client PID when connecting to CameraService so CameraService can check if the client PID has permission to use camera. Change CameraService to check calling UID is trusted before using the passed in client PID and client UID to verify permission. Bug: 24511454 Change-Id: I4906ab73510e2c75714690bed675e3c13aca3ccf
* Revert "Add camera app op - camera"Svetoslav Ganov2015-05-121-2/+2
| | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* Add camera app op - cameraSvet Ganov2015-05-021-2/+2
| | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* camera2: Remove ProCamera.Ruben Brunk2015-03-201-2/+0
| | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* Update calls to IInterface::asBinder()Marco Nelissen2014-11-141-2/+2
| | | | | | to use the new static version. Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
* libcamera_client: 64-bit compile issueMark Salyzyn2014-06-091-2/+2
| | | | | | | - size_t print format - some unused parameter warning messages Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
* Refactor CameraService to handle errors properly.Ruben Brunk2013-08-161-3/+8
| | | | | | | | Bug: 10361136 -Connect calls now return status_t error flags. Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
* (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-111-35/+0
| | | | Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
* Camera: Drop ProCamera connections when a Camera connection happensIgor Murashkin2013-02-281-0/+16
| | | | | | | * Also adds an ICameraServiceListener with available/not available statuses Bug: 8291653 Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
* camera_client: refactor Camera/ProCamera commonalities into BasicCameraIgor Murashkin2013-02-261-0/+237
Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9