Harden remapCameraApi() API
- Pluralize list fields, it is easier
to work with.
- Change String[] to List<String>. This
has no effect on the cpp handling, it
just makes the java client code easier
to work with.
- Check against more edge cases.
- Fix small bug in parsing found after
E2E testing (pass argument by reference)
Bug: 286287541
Test: Tested the binder calls using custom service.
Was able to trigger all edge cases.
Change-Id: I9dedf5aeace3ac7da32b6a362c1fc9c7fd7c98ce
Merged-In: I176959e56563bc587c4fca594cfc242941b503d6
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index b9966b3..65b11e7 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -964,8 +964,8 @@
/** Parses cameraIdRemapping parcelable into the native cameraIdRemappingMap. */
binder::Status parseCameraIdRemapping(
- const hardware::CameraIdRemapping& cameraIdRemapping,
- TCameraIdRemapping cameraIdRemappingMap);
+ const hardware::CameraIdRemapping& cameraIdRemapping,
+ /* out */ TCameraIdRemapping* cameraIdRemappingMap);
/**
* Resolve the (potentially remapped) camera Id to use for packageName.