Merge "CameraDeviceClient: replace %lu with PRIu64." into main (f41dec5d) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1240,7 +1240,7 @@ binder::Status CameraDeviceClient::createStream(
	int i = 0;		int i = 0;
	for (auto& surfaceKey : surfaceKeys) {		for (auto& surfaceKey : surfaceKeys) {
	#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES		#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES
	ALOGV("%s: mStreamMap add surfaceKey %lu streamId %d, surfaceId %d",		ALOGV("%s: mStreamMap add surfaceKey %" PRIu64 " streamId %d, surfaceId %d",
	__FUNCTION__, surfaceKey, streamId, i);		__FUNCTION__, surfaceKey, streamId, i);
	#else		#else
	ALOGV("%s: mStreamMap add surfaceKey %p streamId %d, surfaceId %d",		ALOGV("%s: mStreamMap add surfaceKey %p streamId %d, surfaceId %d",
	@@ -1981,8 +1981,8 @@ binder::Status CameraDeviceClient::finalizeOutputConfigurations(int32_t streamId
	"Could not get the SurfaceKey");		"Could not get the SurfaceKey");
	}		}
	#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES		#if WB_LIBCAMERASERVICE_WITH_DEPENDENCIES
	ALOGV("%s: mStreamMap add surface_key %lu streamId %d, surfaceId %d", __FUNCTION__,		ALOGV("%s: mStreamMap add surface_key %" PRIu64 " streamId %d, surfaceId %d",
	surfaceKey, streamId, consumerSurfaceIds[i]);		__FUNCTION__, surfaceKey, streamId, consumerSurfaceIds[i]);
	#else		#else
	ALOGV("%s: mStreamMap add surface_key %p streamId %d, surfaceId %d", __FUNCTION__,		ALOGV("%s: mStreamMap add surface_key %p streamId %d, surfaceId %d", __FUNCTION__,
	surfaceKey.get(), streamId, consumerSurfaceIds[i]);		surfaceKey.get(), streamId, consumerSurfaceIds[i]);