Merge "Throw NPE if s is null"

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java
index b4445ca1e0ed..e9b0d325d257 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;