diff options
| author | Angus Kong <shkong@google.com> | 2012-06-13 15:00:23 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2012-06-13 18:15:11 +0800 |
| commit | 3ae6814e3017ea25a57a0f885579022c4faf4e84 (patch) | |
| tree | 560ac6eb343ff8f5da9351339818ac14477b1224 /src/com/android/camera/CameraSettings.java | |
| parent | 1461b5333aab31faee65272d64c2ac7f9809d4d0 (diff) | |
| download | LegacyCamera-3ae6814e3017ea25a57a0f885579022c4faf4e84.zip LegacyCamera-3ae6814e3017ea25a57a0f885579022c4faf4e84.tar.gz LegacyCamera-3ae6814e3017ea25a57a0f885579022c4faf4e84.tar.bz2 | |
Fix NPE when only front cameras are available.
bug:6643208
Change-Id: Ie4eef4a671091cd9557d1c51ab5c3919b6b30652
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index c861366..2d33b69 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -225,16 +225,9 @@ public class CameraSettings { return; } - CharSequence[] entryValues = new CharSequence[2]; - for (int i = 0; i < mCameraInfo.length; ++i) { - int index = - (mCameraInfo[i].facing == CameraInfo.CAMERA_FACING_FRONT) - ? CameraInfo.CAMERA_FACING_FRONT - : CameraInfo.CAMERA_FACING_BACK; - if (entryValues[index] == null) { - entryValues[index] = "" + i; - if (entryValues[((index == 1) ? 0 : 1)] != null) break; - } + CharSequence[] entryValues = new CharSequence[numOfCameras]; + for (int i = 0; i < numOfCameras; ++i) { + entryValues[i] = "" + i; } preference.setEntryValues(entryValues); } |