commit 467cabe879cb58df96f6a84879f5fb226e049aeb
author Kenny Root <kroot@google.com> Mon Jul 25 15:58:31 2011 -0700
committer Kenny Root <kroot@google.com> Mon Jul 25 17:00:50 2011 -0700
tree 2c23bec12bd220dceb5f6a910faa2ef7ab15e5fc
parent b243d5bc7db88396f0da304553687e7a0bccfa3d

Throw NullPointerException on args to Time#compare

Check for null on arguments to Time#compare(Time, Time) before passing
it down to JNI code.

Bug: 5073949
Change-Id: I077e9d5194a89206d1e51fc89a72c8a72e29f8f1

core/jni/android_text_format_Time.cpp

diff --git a/core/jni/android_text_format_Time.cpp b/core/jni/android_text_format_Time.cpp
index c152aa8..69c6021 100644
--- a/core/jni/android_text_format_Time.cpp
+++ b/core/jni/android_text_format_Time.cpp
@@ -641,7 +641,7 @@
     /* name, signature, funcPtr */
     { "normalize",               "(Z)J",                                        (void*)android_text_format_Time_normalize },
     { "switchTimezone",          "(Ljava/lang/String;)V",                       (void*)android_text_format_Time_switchTimezone },
-    { "compare",                 "(Landroid/text/format/Time;Landroid/text/format/Time;)I",     (void*)android_text_format_Time_compare },
+    { "nativeCompare",           "(Landroid/text/format/Time;Landroid/text/format/Time;)I",     (void*)android_text_format_Time_compare },
     { "format1",                 "(Ljava/lang/String;)Ljava/lang/String;",      (void*)android_text_format_Time_format },
     { "format2445",              "()Ljava/lang/String;",                        (void*)android_text_format_Time_format2445 },
     { "toString",                "()Ljava/lang/String;",                        (void*)android_text_format_Time_toString },