From 11afa8a466be7fd0bb486b36612d656a09f88f46 Mon Sep 17 00:00:00 2001
From: Alon Albert <aalbert@google.com>
Date: Thu, 26 Jan 2012 14:25:19 -0800
Subject: [PATCH] Throw NPE if s is null

Bug: 5926510
Change-Id: I3d0a38d31695a8b103b3d153d90d83474f56990e
---
 core/java/android/text/format/Time.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index b4445ca1e0ed8..e9b0d325d2577 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -481,6 +481,9 @@ public class Time {
      * @throws android.util.TimeFormatException if s cannot be parsed.
      */
      public boolean parse3339(String s) {
+         if (s == null) {
+             throw new NullPointerException("time string is null");
+         }
          if (nativeParse3339(s)) {
              timezone = TIMEZONE_UTC;
              return true;