commit c523ff2e14e294be6b7f2ab6c1c3f20b57083a7f
author Zach Riggle <riggle@google.com> Fri Mar 20 20:30:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 20 20:30:34 2015 +0000
tree 9318be7ae430f87a9c91c41d3c3bcf5fc10ab0d4
parent 9306115a474168ff12dd5312c5820e9c54134e9c
parent 8505f1367ac4a6d6ea3ab7c34c98ed4f961df280

Merge "Fix method name for doNvmapIocFromIdTest" into lmp-mr1-dev

tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp

diff --git a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
index 776729d..a35581d 100644
--- a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
@@ -285,7 +285,7 @@
 static jboolean android_security_cts_NativeCodeTest_doNvmapIocFromIdTest(JNIEnv*, jobject)
 {
     /*
-     * IOCTL code specified from the original Qualcomm notification.
+     * IOCTL code specified from the original notification.
      * Also available in:
      *     .../kernel/tegra/drivers/video/tegra/nvmap/nvmap_ioctl.h
      * #define NVMAP_IOC_MAGIC 'N'
@@ -325,7 +325,7 @@
             (void *) android_security_cts_NativeCodeTest_doCVE20141710Test },
     {  "doFutexTest", "()Z",
             (void *) android_security_cts_NativeCodeTest_doFutexTest },
-    {  "doFutexTest", "()Z",
+    {  "doNvmapIocFromIdTest", "()Z",
             (void *) android_security_cts_NativeCodeTest_doNvmapIocFromIdTest },
 };