diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-06 16:03:29 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-09-06 16:03:29 -0700 |
| commit | 7441695049674e457064f289b74b11f62fa5c943 (patch) | |
| tree | 91d7cf65b43d0601c3647360d5c83220ed0f6d87 /core/java/android/hardware | |
| parent | 298cbe9c403f9c6c66cecf601cccfcfd82e50930 (diff) | |
| download | frameworks_base-7441695049674e457064f289b74b11f62fa5c943.zip frameworks_base-7441695049674e457064f289b74b11f62fa5c943.tar.gz frameworks_base-7441695049674e457064f289b74b11f62fa5c943.tar.bz2 | |
camera2: Don't NPE in onStatusChanged
Bug: 10360518
Change-Id: Icf70a908581af209b889237ad64a555b7e794b67
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)); |