From 62d202f9f2d25ec661d85e15581a43bfcc9bd528 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 21 Feb 2013 01:46:17 +0800 Subject: [PATCH] camera: fix NullPointerException --- core/java/android/hardware/Camera.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index acf0677559fd..218cc378b049 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -4116,6 +4116,8 @@ public class Camera { return Float.parseFloat(mMap.get(key)); } catch (NumberFormatException ex) { return defaultValue; + } catch (NullPointerException ex) { + return defaultValue; } } @@ -4125,6 +4127,8 @@ public class Camera { return Integer.parseInt(mMap.get(key)); } catch (NumberFormatException ex) { return defaultValue; + } catch (NullPointerException ex) { + return defaultValue; } } -- 2.11.0