summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorBenjamin Hendricks <coolbnjmn@google.com>2013-08-15 14:10:12 -0700
committerBenjamin Hendricks <coolbnjmn@google.com>2013-08-15 14:31:38 -0700
commitd27e8768bc8135b6677b649cecec420e6b9bb0dc (patch)
tree3079438ad5ace6f26e58951994817103a3122c6c /core/java/android/hardware
parent24eb8a313f1a80a35566b8dc456ec2684a05a22e (diff)
downloadframeworks_base-d27e8768bc8135b6677b649cecec420e6b9bb0dc.zip
frameworks_base-d27e8768bc8135b6677b649cecec420e6b9bb0dc.tar.gz
frameworks_base-d27e8768bc8135b6677b649cecec420e6b9bb0dc.tar.bz2
Camera2: Fixed issue with HashSet not being initialized
Bug: 10345921 Change-Id: I6d12562484b0ed9c59b22e231c3dd050e046b58d
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/CameraManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 5bfd162..402c433 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -54,7 +54,7 @@ public final class CameraManager {
private final ICameraService mCameraService;
private ArrayList<String> mDeviceIdList;
- private HashSet<CameraListener> mListenerSet;
+ private HashSet<CameraListener> mListenerSet = new HashSet<CameraListener>();
private final Context mContext;
private final Object mLock = new Object();