diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-14 22:50:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-14 22:50:26 -0700 |
| commit | 0a311059917ef6c083ea2b37e233597bfc7c2ab8 (patch) | |
| tree | 221f144e7934c3f877c22a6e6f8d69d9d9c5c802 /src/com/android | |
| parent | 8ef1e424dfd6f5f66dfdb60caa3707f78b78fd33 (diff) | |
| parent | ba52a30506e83ebb9ec5d55ccb2090ce9461b6ee (diff) | |
| download | android_packages_apps_Snap-0a311059917ef6c083ea2b37e233597bfc7c2ab8.tar.gz android_packages_apps_Snap-0a311059917ef6c083ea2b37e233597bfc7c2ab8.tar.bz2 android_packages_apps_Snap-0a311059917ef6c083ea2b37e233597bfc7c2ab8.zip | |
Merge "SnapdragonCamera:Fix NullPointerException in monkey test" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3083b6e56..ca4f30bb9 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4864,6 +4864,10 @@ public class PhotoModule @Override public void onMakeupLevel(String key, String value) { + if (mCameraDevice == null) { + Log.d(TAG,"MakeupLevel failed CameraDevice not yet initialized"); + return; + } synchronized (mCameraDevice) { onMakeupLevelSync(key, value); } |