diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-14 12:35:35 -0800 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2016-01-20 23:33:46 -0700 |
| commit | 0a67cc64e652830a67f3635f28a7d659b29e258a (patch) | |
| tree | 031f6f68686167c8475e5dd2d07a036dc678f70f | |
| parent | a6373f1e87bbb02f0134b2afe4c868c9ef727a30 (diff) | |
| download | android_packages_apps_Snap-0a67cc64e652830a67f3635f28a7d659b29e258a.tar.gz android_packages_apps_Snap-0a67cc64e652830a67f3635f28a7d659b29e258a.tar.bz2 android_packages_apps_Snap-0a67cc64e652830a67f3635f28a7d659b29e258a.zip | |
SnapdragonCamera: Adding current camera null check
Adding null check on potential race condition case.
Change-Id: Ia837acbdf5fbef824d55b318d9cbddf8a8faf7ef
CRs-Fixed: 961548
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 89c757052..a1b092f1a 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -716,7 +716,8 @@ class AndroidCameraManagerImpl implements CameraManager { public void onAutoFocusMoving( final boolean moving, android.hardware.Camera camera) { final android.hardware.Camera currentCamera = mCamera.getCamera(); - + if(currentCamera == null) + return; mHandler.post(new Runnable() { @Override public void run() { |