| commit | 74cd373d6a9d5539ea9856b50f1c316ddc580d78 | [log] [tgz] |
|---|---|---|
| author | Ravneet <rdhanjal@google.com> | Wed Mar 30 05:33:03 2022 +0000 |
| committer | Ravneet Dhanjal <rdhanjal@google.com> | Tue Sep 13 18:29:10 2022 +0000 |
| tree | 89e210ccee2f7a76ced259de773935b96d107fd6 | |
| parent | 1f0ac9da70d59bb6fcf3480fd47083287513b31b [diff] |
Add disable/enable camera service watchdog feature - Allows the camera service watchdog to be enabled and disabled - Usage: adb shell cmd media.camera set-cameraservice-watchdog [0/1] Test: Manual Bug: 246600576 Change-Id: I528ca819cc2be03006c77e869adf8f5fa99128d6 (cherry picked from commit aeb20dc9ce47cc36852a366cd695346550d4ca20)
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 5e91501..15df981 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -1730,6 +1730,10 @@ return binder::Status::ok(); } +status_t CameraDeviceClient::setCameraServiceWatchdog(bool enabled) { + return mDevice->setCameraServiceWatchdog(enabled); +} + status_t CameraDeviceClient::setRotateAndCropOverride(uint8_t rotateAndCrop) { if (rotateAndCrop > ANDROID_SCALER_ROTATE_AND_CROP_AUTO) return BAD_VALUE;
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index c5aad6b..45915ba 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h
@@ -206,6 +206,8 @@ virtual status_t stopWatchingTags(int out); virtual status_t dumpWatchedEventsToVector(std::vector<std::string> &out); + virtual status_t setCameraServiceWatchdog(bool enabled); + /** * Device listener interface */
diff --git a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.cpp b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.cpp index 9303fd2..beb655b 100644 --- a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.cpp +++ b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.cpp
@@ -66,6 +66,10 @@ return OK; } +status_t CameraOfflineSessionClient::setCameraServiceWatchdog(bool) { + return OK; +} + status_t CameraOfflineSessionClient::setRotateAndCropOverride(uint8_t /*rotateAndCrop*/) { // Since we're not submitting more capture requests, changes to rotateAndCrop override // make no difference.
diff --git a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h index f2c42d8..9ea1093 100644 --- a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h +++ b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h
@@ -84,6 +84,8 @@ bool supportsCameraMute() override; status_t setCameraMute(bool enabled) override; + status_t setCameraServiceWatchdog(bool enabled) override; + // permissions management status_t startCameraOps() override; status_t finishCameraOps() override;