From a7bdedabf447a559e0b914e4e5623f3af5ac8ef1 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Tue, 1 Sep 2009 12:22:05 +0800
Subject: [PATCH] Fix 2081525: NPE in MediaScannerService.

Handle the case where the datetime string in jpeg exif is not in the format we expect.

Change-Id: I5462052c3dd723d01bce45f4924137632d081400
---
 media/java/android/media/ExifInterface.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index d578c8159f1f3..aba40b359e262 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -340,6 +340,7 @@ public class ExifInterface {
         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;