Merge pull request #4 from FabinPaul/master

Fix for CameraView blacks outs and Aspect ratio iteration issue

Author: phileo

library/src/main/api14/com/google/android/cameraview/Camera1.java

@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
@@ -151,7 +152,9 @@ int getFacing() {
     @Override
     Set<AspectRatio> getSupportedAspectRatios() {
         SizeMap idealAspectRatios = mPreviewSizes;
-        for (AspectRatio aspectRatio : idealAspectRatios.ratios()) {
+
+        Set<AspectRatio> ratios = new TreeSet<>(idealAspectRatios.ratios());
+        for (AspectRatio aspectRatio : ratios) {
             if (mPictureSizes.sizes(aspectRatio) == null) {
                 idealAspectRatios.remove(aspectRatio);
             }

library/src/main/java/com/google/android/cameraview/CameraView.java

@@ -244,6 +244,9 @@ protected void onRestoreInstanceState(Parcelable state) {
      */
     public void start() {
         if (!mImpl.start()) {
+            if (mImpl.getView() != null) {
+                this.removeView(mImpl.getView());
+            }
             //store the state ,and restore this state after fall back o Camera1
             Parcelable state=onSaveInstanceState();
             // Camera2 uses legacy hardware layer; fall back to Camera1