Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev

am: 26ff84d3f4

Change-Id: Ia21d3201d854c44f1372616981df855cf2ba5781

src/com/android/settings/wifi/qrcode/QrCamera.java

@@ -313,9 +313,6 @@ public class QrCamera extends Handler {
     private void setTransformationMatrix(Size viewSize) {
         // Check aspect ratio, can only handle square view.
         final int viewRatio = (int)getRatio(viewSize.getWidth(), viewSize.getHeight());
-        if (viewRatio != 1) {
-            throw new IllegalArgumentException("Preview area should be square");
-        }
 
         final boolean isPortrait = mContext.get().getResources().getConfiguration().orientation
                 == Configuration.ORIENTATION_PORTRAIT ? true : false;