From b0056642cab30647d1f72190d864622bf4728ea0 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Mon, 28 Jul 2014 13:17:05 -0700
Subject: Camera2: Fix wrong usage of toArray

Change to use "<T> T[]" version of toArray.

Change-Id: I021ed5a4e446b34028810e8acea3395c1c3387e7
---
 .../android/hardware/camera2/params/StreamConfigurationMap.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
index 8c30fd4a6ec4..c31f59e895f2 100644
--- a/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
+++ b/core/java/android/hardware/camera2/params/StreamConfigurationMap.java
@@ -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()]);
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b