diff options
author | Emilian Peev <epeev@google.com> | 2019-09-03 17:52:11 -0700 |
---|---|---|
committer | Bruno Martins <bgcngm@gmail.com> | 2020-01-03 13:20:39 +0100 |
commit | b9acfaa1f771ae19b45d6affad2d64ef3e4b1136 (patch) | |
tree | e80ccbdce52e22522222b16ee2ea9ba2b2f9f5d7 | |
parent | e8bc27f4b9f90155218a8f91d9e4cc5e41c4fa1b (diff) | |
download | android_packages_apps_Camera2-lineage-17.0.tar.gz android_packages_apps_Camera2-lineage-17.0.tar.bz2 android_packages_apps_Camera2-lineage-17.0.zip |
Avoid NPE in case either front or back camera is absentlineage-17.0
Check the front or back facing camera id before
trying to insert it in the facing cache.
Bug: 140406062
Test: Manual using application
Change-Id: I9b263b8532284932a5f2d8d88ea20e8881ab1de3
Merged-In: I9b263b8532284932a5f2d8d88ea20e8881ab1de3
-rw-r--r-- | src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java index 031c6103d..a493e736d 100644 --- a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java +++ b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java @@ -145,7 +145,9 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager { id = findFirstBackCameraId(); } - mCameraFacingCache.put(facing, id); + if (id != null) { + mCameraFacingCache.put(facing, id); + } return id; } @@ -187,4 +189,4 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager { return null; } -}
\ No newline at end of file +} |