diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-10 19:29:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-10 19:29:27 +0000 |
| commit | 50209368626d53b1f8a4a6fdf50d280c7cf65a65 (patch) | |
| tree | f0b8beddae40d3051e73c4bf73b6e2dc9b42fc03 /core/java/android/hardware | |
| parent | 59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7 (diff) | |
| parent | 7441695049674e457064f289b74b11f62fa5c943 (diff) | |
| download | frameworks_base-50209368626d53b1f8a4a6fdf50d280c7cf65a65.zip frameworks_base-50209368626d53b1f8a4a6fdf50d280c7cf65a65.tar.gz frameworks_base-50209368626d53b1f8a4a6fdf50d280c7cf65a65.tar.bz2 | |
Merge "camera2: Don't NPE in onStatusChanged" into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 8903b4a..ff9282e 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -55,7 +55,7 @@ public final class CameraManager { private final ICameraService mCameraService; private ArrayList<String> mDeviceIdList; - private HashSet<CameraListener> mListenerSet = new HashSet<CameraListener>(); + private final HashSet<CameraListener> mListenerSet = new HashSet<CameraListener>(); private final Context mContext; private final Object mLock = new Object(); @@ -332,7 +332,7 @@ public final class CameraManager { Integer oldStatus = mDeviceStatus.put(id, status); - if (oldStatus == status) { + if (oldStatus != null && oldStatus == status) { Log.v(TAG, String.format( "Device status changed to 0x%x, which is what it already was", status)); |