commit c98d68cd56338ec57695b3c35114fbde88d4bde8
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 22:39:22 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 31 22:39:22 2009 -0700
tree 4286e8cc2c5f64750bbd1dd7e81f56cdd1955e7b
parent 808c739a9428b11a811659403bbb46a0814a2928
parent 1f952a178db86559ff4bab79c4a9b5fae18096bf

Merge change 22886 into eclair

* changes:
  Move SMS pdu creation fully into the central Phone process.

media/java/android/media/ExifInterface.java

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index d578c81..aba40b3 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -340,6 +340,7 @@
         ParsePosition pos = new ParsePosition(0);
         try {
             Date date = sFormatter.parse(dateTimeString, pos);
+            if (date == null) return -1;
             return date.getTime();
         } catch (IllegalArgumentException ex) {
             return -1;