commit aeb20dc9ce47cc36852a366cd695346550d4ca20
author Ravneet <rdhanjal@google.com> Wed Mar 30 05:33:03 2022 +0000
committer Ravneet <rdhanjal@google.com> Mon Apr 11 17:23:10 2022 +0000
tree 1d614fcf37451390c6730004314347073aef2115
parent a32bd3bd438685c028bbaf269fe86492a18c6582

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: 62296107
Change-Id: I528ca819cc2be03006c77e869adf8f5fa99128d6

services/camera/libcameraservice/api1/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 5fcd43e..f8589c7 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -2294,6 +2294,10 @@
     return INVALID_OPERATION;
 }
 
+status_t Camera2Client::setCameraServiceWatchdog(bool enabled) {
+    return mDevice->setCameraServiceWatchdog(enabled);
+}
+
 status_t Camera2Client::setRotateAndCropOverride(uint8_t rotateAndCrop) {
     if (rotateAndCrop > ANDROID_SCALER_ROTATE_AND_CROP_AUTO) return BAD_VALUE;
 

services/camera/libcameraservice/api1/Camera2Client.h

diff --git a/services/camera/libcameraservice/api1/Camera2Client.h b/services/camera/libcameraservice/api1/Camera2Client.h
index 64ab8ff..0e72553 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.h
+++ b/services/camera/libcameraservice/api1/Camera2Client.h
@@ -90,6 +90,8 @@
     virtual bool            supportsCameraMute();
     virtual status_t        setCameraMute(bool enabled);
 
+    virtual status_t        setCameraServiceWatchdog(bool enabled);
+
     /**
      * Interface used by CameraService
      */