Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "camera2: Don't NPE in onStatusChanged" into klp-dev

Browse Source
This commit is contained in:
Igor Murashkin
2013-09-10 19:29:27 +00:00
committed by Android (Google) Code Review
parent 59b7a4ec9c 7441695049
commit 5020936862
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -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));