diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-07-28 22:19:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:21 +0000 |
| commit | 53bbf11f414dfc74d545ae1539ef5028dcb25eb4 (patch) | |
| tree | b0dfa18b623def3d1dbf88a9134f43b69e6364f2 | |
| parent | a346442057fca55c3f447ad02372a5e4592578ac (diff) | |
| parent | b0056642cab30647d1f72190d864622bf4728ea0 (diff) | |
| download | frameworks_base-53bbf11f414dfc74d545ae1539ef5028dcb25eb4.zip frameworks_base-53bbf11f414dfc74d545ae1539ef5028dcb25eb4.tar.gz frameworks_base-53bbf11f414dfc74d545ae1539ef5028dcb25eb4.tar.bz2 | |
Merge "Camera2: Fix wrong usage of toArray" into lmp-dev
| -rw-r--r-- | core/java/android/hardware/camera2/params/StreamConfigurationMap.java | 7 |
1 files 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 8c30fd4..c31f59e 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()]); } /** |