Merge "Camera2: Fix wrong usage of toArray" into lmp-dev (53bbf11f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/params/StreamConfigurationMap.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.util.Size;
		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.Objects;
		import java.util.Set;

		import static com.android.internal.util.Preconditions.*;

		@@ -398,7 +399,8 @@ public final class StreamConfigurationMap {
		* @see #getHighSpeedVideoFpsRangesFor(Size)
		*/
		public Size[] getHighSpeedVideoSizes() {
		return (Size[]) mHighSpeedVideoSizeMap.keySet().toArray();
		Set<Size> keySet = mHighSpeedVideoSizeMap.keySet();
		return keySet.toArray(new Size[keySet.size()]);
		}

		/**
		@@ -475,7 +477,8 @@ public final class StreamConfigurationMap {
		*/
		@SuppressWarnings("unchecked")
		public Range<Integer>[] getHighSpeedVideoFpsRanges() {
		return (Range<Integer>[]) mHighSpeedVideoFpsRangeMap.keySet().toArray();
		Set<Range<Integer>> keySet = mHighSpeedVideoFpsRangeMap.keySet();
		return keySet.toArray(new Range[keySet.size()]);
		}

		/**