commit 815af1ff595a6c028f28c16139a9e64ad98507a3
author Alon Albert <aalbert@google.com> Thu Jan 26 17:05:58 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 26 17:05:58 2012 -0800
tree 6a7249060e08a704ec1ea621d9ebe00a91ddc3d8
parent 4bc8bfaf11839b12d88fcb40e57a1eea456aef7c
parent 11afa8a466be7fd0bb486b36612d656a09f88f46

Merge "Throw NPE if s is null"

core/java/android/text/format/Time.java

diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index b4445ca..e9b0d32 100644
--- a/core/java/android/text/format/Time.java
+++ b/core/java/android/text/format/Time.java
@@ -481,6 +481,9 @@
      * @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;