1 files changed, 5 insertions, 6 deletions
diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp
index b3d90faab7..e83d92873f 100644
--- a/platform/android/src/style/layers/heatmap_layer.cpp
+++ b/platform/android/src/style/layers/heatmap_layer.cpp
@@ -109,22 +109,21 @@ namespace android {
     }
 
 
-    jni::Class<HeatmapLayer> HeatmapLayer::javaClass;
-
     jni::jobject* HeatmapLayer::createJavaPeer(jni::JNIEnv& env) {
-        static auto constructor = HeatmapLayer::javaClass.template GetConstructor<jni::jlong>(env);
-        return HeatmapLayer::javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
+        static auto javaClass = jni::Class<HeatmapLayer>::Singleton(env);
+        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
+        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
     }
 
     void HeatmapLayer::registerNative(jni::JNIEnv& env) {
         // Lookup the class
-        HeatmapLayer::javaClass = *jni::Class<HeatmapLayer>::Find(env).NewGlobalRef(env).release();
+        static auto javaClass = jni::Class<HeatmapLayer>::Singleton(env);
 
         #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
 
         // Register the peer
         jni::RegisterNativePeer<HeatmapLayer>(
-            env, HeatmapLayer::javaClass, "nativePtr",
+            env, javaClass, "nativePtr",
             std::make_unique<HeatmapLayer, JNIEnv&, jni::String, jni::String>,
             "initialize",
             "finalize",