Commit: f505df2e1b7cf9f9df7a34ba1583e38af75e7db4 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: f505df2e1b7cf9f9df7a34ba1583e38af75e7db4 (tree)
• Time: 2015-12-22 13:13:50
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

camera: fix NullPointerException

Change Summary

• modified: core/java/android/hardware/Camera.java

Incremental Difference

--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -4108,6 +4108,8 @@ public class Camera {
                 return Float.parseFloat(mMap.get(key));
             } catch (NumberFormatException ex) {
                 return defaultValue;
+            } catch (NullPointerException ex) {
+                return defaultValue;
             }
         }
 
@@ -4117,6 +4119,8 @@ public class Camera {
                 return Integer.parseInt(mMap.get(key));
             } catch (NumberFormatException ex) {
                 return defaultValue;
+            } catch (NullPointerException ex) {
+                return defaultValue;
             }
         }