From e373fa476b3df95b055bbc10f033db42a0764bdc Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Mon, 27 Dec 2021 11:51:32 -0600
Subject: [PATCH] [wpiutil] Add disableMockTime to JNI (#3839)

This exposes the equivalent of SetNowImpl(nullptr) to Java.
---
 .../main/java/edu/wpi/first/util/WPIUtilJNI.java    |  2 ++
 wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp      | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
index 35a9dbdbaf..8fee5f5448 100644
--- a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
+++ b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
@@ -56,6 +56,8 @@ public final class WPIUtilJNI {
 
   public static native void enableMockTime();
 
+  public static native void disableMockTime();
+
   public static native void setMockTime(long time);
 
   public static native long now();
diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
index 29682715c0..7f4b5823a9 100644
--- a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
+++ b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
@@ -75,6 +75,19 @@ Java_edu_wpi_first_util_WPIUtilJNI_enableMockTime
   wpi::SetNowImpl([] { return mockNow; });
 }
 
+/*
+ * Class:     edu_wpi_first_util_WPIUtilJNI
+ * Method:    disableMockTime
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL
+Java_edu_wpi_first_util_WPIUtilJNI_disableMockTime
+  (JNIEnv*, jclass)
+{
+  mockTimeEnabled = false;
+  wpi::SetNowImpl(nullptr);
+}
+
 /*
  * Class:     edu_wpi_first_util_WPIUtilJNI
  * Method:    setMockTime