Preview size is not correctly calculated in Portrait mode

When I use camera preview in portrait mode on Android, the size/aspect ratio is not correctly calculated. The side edges of the preview are cut off, compared to what the regular camera shows.

I see these values in the log, which are obviously not correct, as they are the same values for width and height

optimal preview size: w: 1088 h: 1088

I believe this is because targetHeight is set to surface height, and then used to both discover available camera aspect ratios, and if no suitable one is not found, targetHeight only is used to find a match.

I made a quick test change to set targetHeight to surface width when in portrait mode, leaving the rest of the logic alone, and that seemed to work.

After this change, I see this in the log:

optimal preview size: w: 1920 h: 1080

and, the preview sides are now visible.

Code changed in Preview.java

private Camera.Size getOptimalPreviewSize(List sizes, int w, int h) {
final double ASPECT_TOLERANCE = 0.1;
double targetRatio = (double) w / h;
int targetHeight = h;
if (displayOrientation == 90 || displayOrientation == 270) {
targetRatio = (double) h / w;
**targetHeight = w;**
}