GCH: dumpState->dump and remove METHOD_NOT_SUPPORTED in AIDL interface.

Bug: 218911443

Test: dumpsys media.camera

Change-Id: Ib956d97443755553c9e8c86c4784ea2579405b59
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

5 files changed, 37 insertions, 67 deletions

diff --git a/common/hal/aidl_service/aidl_camera_device.cc b/common/hal/aidl_service/aidl_camera_device.cc
index 00c80fe..c8a119e 100644
--- a/common/hal/aidl_service/aidl_camera_device.cc
+++ b/common/hal/aidl_service/aidl_camera_device.cc
@@ -232,16 +232,16 @@ ScopedAStatus AidlCameraDevice::openInjectionSession(
     std::shared_ptr<ICameraInjectionSession>* session) {
   if (session == nullptr) {
     return ScopedAStatus::fromServiceSpecificError(
-        static_cast<int32_t>(Status::ILLEGAL_ARGUMENT));
+        static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED));
   }
   *session = nullptr;
   return ScopedAStatus::ok();
 }
 
-ScopedAStatus AidlCameraDevice::dumpState(const ::ndk::ScopedFileDescriptor& fd) {
-  int raw_fd = fd.get();
-  google_camera_device_->DumpState(raw_fd);
-  return ScopedAStatus::ok();
+binder_status_t AidlCameraDevice::dump(int fd, const char** /*args*/,
+                                       uint32_t /*numArgs*/) {
+  google_camera_device_->DumpState(fd);
+  return OK;
 }
 
 ScopedAStatus AidlCameraDevice::isStreamCombinationSupported(
diff --git a/common/hal/aidl_service/aidl_camera_device.h b/common/hal/aidl_service/aidl_camera_device.h
index 4ee5c4e..86b7263 100644
--- a/common/hal/aidl_service/aidl_camera_device.h
+++ b/common/hal/aidl_service/aidl_camera_device.h
@@ -58,37 +58,33 @@ class AidlCameraDevice : public BnCameraDevice {
       std::unique_ptr<CameraDevice> google_camera_device);
   virtual ~AidlCameraDevice() = default;
 
-  // Override functions in ICameraDevice
-
-  virtual ScopedAStatus dumpState(const ScopedFileDescriptor& in_fd) override;
+  binder_status_t dump(int fd, const char**, uint32_t) override;
 
-  virtual ScopedAStatus getCameraCharacteristics(
+  // Override functions in ICameraDevice
+  ScopedAStatus getCameraCharacteristics(
       CameraMetadata* characteristics) override;
 
-  virtual ScopedAStatus getPhysicalCameraCharacteristics(
+  ScopedAStatus getPhysicalCameraCharacteristics(
       const std::string& in_physicalCameraId,
       CameraMetadata* characteristics) override;
 
-  virtual ScopedAStatus getResourceCost(
-      CameraResourceCost* resource_cost) override;
+  ScopedAStatus getResourceCost(CameraResourceCost* resource_cost) override;
 
-  virtual ScopedAStatus isStreamCombinationSupported(
+  ScopedAStatus isStreamCombinationSupported(
       const StreamConfiguration& in_streams, bool* supported) override;
 
-  virtual ScopedAStatus open(
-      const std::shared_ptr<ICameraDeviceCallback>& in_callback,
-      std::shared_ptr<ICameraDeviceSession>* session) override;
+  ScopedAStatus open(const std::shared_ptr<ICameraDeviceCallback>& in_callback,
+                     std::shared_ptr<ICameraDeviceSession>* session) override;
 
-  virtual ScopedAStatus openInjectionSession(
+  ScopedAStatus openInjectionSession(
       const std::shared_ptr<ICameraDeviceCallback>& in_callback,
       std::shared_ptr<ICameraInjectionSession>* session) override;
 
-  virtual ScopedAStatus setTorchMode(bool on) override;
+  ScopedAStatus setTorchMode(bool on) override;
 
-  virtual ScopedAStatus turnOnTorchWithStrengthLevel(
-      int32_t torchStrength) override;
+  ScopedAStatus turnOnTorchWithStrengthLevel(int32_t torchStrength) override;
 
-  virtual ScopedAStatus getTorchStrengthLevel(int32_t* strength_level) override;
+  ScopedAStatus getTorchStrengthLevel(int32_t* strength_level) override;
 
   // End of override functions in ICameraDevice
   AidlCameraDevice() = default;
diff --git a/common/hal/aidl_service/aidl_camera_device_session.h b/common/hal/aidl_service/aidl_camera_device_session.h
index 3761e66..e14604d 100644
--- a/common/hal/aidl_service/aidl_camera_device_session.h
+++ b/common/hal/aidl_service/aidl_camera_device_session.h
@@ -70,43 +70,42 @@ class AidlCameraDeviceSession : public BnCameraDeviceSession {
 
   // functions in ICameraDeviceSession
 
-  virtual ScopedAStatus close() override;
+  ScopedAStatus close() override;
 
-  virtual ScopedAStatus configureStreams(const StreamConfiguration&,
-                                         std::vector<HalStream>*) override;
+  ScopedAStatus configureStreams(const StreamConfiguration&,
+                                 std::vector<HalStream>*) override;
 
-  virtual ScopedAStatus constructDefaultRequestSettings(
+  ScopedAStatus constructDefaultRequestSettings(
       RequestTemplate in_type, CameraMetadata* _aidl_return) override;
 
-  virtual ScopedAStatus flush() override;
+  ScopedAStatus flush() override;
 
-  virtual ScopedAStatus getCaptureRequestMetadataQueue(
+  ScopedAStatus getCaptureRequestMetadataQueue(
       ::aidl::android::hardware::common::fmq::MQDescriptor<
           int8_t, SynchronizedReadWrite>* _aidl_return) override;
 
-  virtual ScopedAStatus getCaptureResultMetadataQueue(
+  ScopedAStatus getCaptureResultMetadataQueue(
       ::aidl::android::hardware::common::fmq::MQDescriptor<
           int8_t, SynchronizedReadWrite>* _aidl_return) override;
 
-  virtual ScopedAStatus isReconfigurationRequired(
+  ScopedAStatus isReconfigurationRequired(
       const CameraMetadata& in_oldSessionParams,
       const CameraMetadata& in_newSessionParams, bool* _aidl_return) override;
 
-  virtual ScopedAStatus processCaptureRequest(
+  ScopedAStatus processCaptureRequest(
       const std::vector<CaptureRequest>& in_requests,
       const std::vector<BufferCache>& in_cachesToRemove,
       int32_t* _aidl_return) override;
 
-  virtual ScopedAStatus signalStreamFlush(
-      const std::vector<int32_t>& in_streamIds,
-      int32_t in_streamConfigCounter) override;
+  ScopedAStatus signalStreamFlush(const std::vector<int32_t>& in_streamIds,
+                                  int32_t in_streamConfigCounter) override;
 
-  virtual ScopedAStatus switchToOffline(
+  ScopedAStatus switchToOffline(
       const std::vector<int32_t>& in_streamsToKeep,
       CameraOfflineSessionInfo* out_offlineSessionInfo,
       std::shared_ptr<ICameraOfflineSession>* _aidl_return) override;
 
-  virtual ScopedAStatus repeatingRequestEnd(
+  ScopedAStatus repeatingRequestEnd(
       int32_t /*in_frameNumber*/,
       const std::vector<int32_t>& /*in_streamIds*/) override {
     return ScopedAStatus::ok();
diff --git a/common/hal/aidl_service/aidl_camera_provider.h b/common/hal/aidl_service/aidl_camera_provider.h
index 8c1e5fd..7cd5bde 100644
--- a/common/hal/aidl_service/aidl_camera_provider.h
+++ b/common/hal/aidl_service/aidl_camera_provider.h
@@ -51,25 +51,23 @@ class AidlCameraProvider : public BnCameraProvider {
 
   // Override functions in ICameraProvider.
 
-  virtual ScopedAStatus setCallback(
+  ScopedAStatus setCallback(
       const std::shared_ptr<ICameraProviderCallback>& callback) override;
 
-  virtual ScopedAStatus getVendorTags(
-      std::vector<VendorTagSection>* vts) override;
+  ScopedAStatus getVendorTags(std::vector<VendorTagSection>* vts) override;
 
-  virtual ScopedAStatus getCameraIdList(
-      std::vector<std::string>* camera_ids) override;
+  ScopedAStatus getCameraIdList(std::vector<std::string>* camera_ids) override;
 
-  virtual ScopedAStatus getCameraDeviceInterface(
+  ScopedAStatus getCameraDeviceInterface(
       const std::string& in_cameraDeviceName,
       std::shared_ptr<ICameraDevice>* device) override;
 
-  virtual ScopedAStatus notifyDeviceStateChange(int64_t in_deviceState) override;
+  ScopedAStatus notifyDeviceStateChange(int64_t in_deviceState) override;
 
-  virtual ScopedAStatus getConcurrentCameraIds(
+  ScopedAStatus getConcurrentCameraIds(
       std::vector<ConcurrentCameraIdCombination>* concurrent_camera_ids) override;
 
-  virtual ScopedAStatus isConcurrentStreamCombinationSupported(
+  ScopedAStatus isConcurrentStreamCombinationSupported(
       const std::vector<CameraIdAndStreamCombination>& in_configs,
       bool* support) override;
 
diff --git a/common/hal/aidl_service/aidl_utils.cc b/common/hal/aidl_service/aidl_utils.cc
index 2de7617..b5a4028 100644
--- a/common/hal/aidl_service/aidl_utils.cc
+++ b/common/hal/aidl_service/aidl_utils.cc
@@ -50,8 +50,6 @@ ScopedAStatus ConvertToAidlReturn(status_t hal_status) {
       return ScopedAStatus::fromServiceSpecificError(
           static_cast<int32_t>(Status::MAX_CAMERAS_IN_USE));
     case UNKNOWN_TRANSACTION:
-      return ScopedAStatus::fromServiceSpecificError(
-          static_cast<int32_t>(Status::METHOD_NOT_SUPPORTED));
     case INVALID_OPERATION:
       return ScopedAStatus::fromServiceSpecificError(
           static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED));
@@ -149,27 +147,6 @@ status_t ConvertToAidlResourceCost(
   return OK;
 }
 
-AidlStatus ConvertToAidlStatus(status_t hal_status) {
-  switch (hal_status) {
-    case OK:
-      return AidlStatus::OK;
-    case BAD_VALUE:
-      return Status::ILLEGAL_ARGUMENT;
-    case -EBUSY:
-      return AidlStatus::CAMERA_IN_USE;
-    case -EUSERS:
-      return AidlStatus::MAX_CAMERAS_IN_USE;
-    case UNKNOWN_TRANSACTION:
-      return AidlStatus::METHOD_NOT_SUPPORTED;
-    case INVALID_OPERATION:
-      return AidlStatus::OPERATION_NOT_SUPPORTED;
-    case DEAD_OBJECT:
-      return AidlStatus::CAMERA_DISCONNECTED;
-    default:
-      return AidlStatus::INTERNAL_ERROR;
-  }
-}
-
 status_t ConvertToHalTemplateType(
     RequestTemplate aidl_template,
     google_camera_hal::RequestTemplate* hal_template) {