commit c5882c4eb614179c8dad323cbbb115b62bb35f43
author Derek Sollenberger <djsollen@google.com> Fri Oct 25 11:11:32 2019 -0400
committer Derek Sollenberger <djsollen@google.com> Thu Feb 20 21:49:44 2020 -0500
tree 95aa6014369da64fa5a6911df001046c002fd51e
parent 5368eda5127701dc84b9e4da61dfbfa685a00b2d

Remove dependencies on headers outside UI module

This includes AndroidRuntime and core_jni_helper.h

Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: If3d26f41eaf4981505ee47634097f3645fd563fd

libs/hwui/jni/GraphicsJNI.h

diff --git a/libs/hwui/jni/GraphicsJNI.h b/libs/hwui/jni/GraphicsJNI.h
index 1e49765..4bf3ed1 100644
--- a/libs/hwui/jni/GraphicsJNI.h
+++ b/libs/hwui/jni/GraphicsJNI.h
@@ -10,10 +10,11 @@
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkColorSpace.h"
-#include <jni.h>
 #include <hwui/Canvas.h>
 #include <hwui/Bitmap.h>
 
+#include "graphics_jni_helpers.h"
+
 class SkBitmapRegionDecoder;
 class SkCanvas;
 
@@ -39,6 +40,20 @@
         kLastEnum_LegacyBitmapConfig = kHardware_LegacyBitmapConfig
     };
 
+    static void setJavaVM(JavaVM* javaVM);
+
+    /** returns a pointer to the JavaVM provided when we initialized the module */
+    static JavaVM* getJavaVM() { return mJavaVM; }
+
+    /** return a pointer to the JNIEnv for this thread */
+    static JNIEnv* getJNIEnv();
+
+    /** create a JNIEnv* for this thread or assert if one already exists */
+    static JNIEnv* attachJNIEnv(const char* envName);
+
+    /** detach the current thread from the JavaVM */
+    static void detachJNIEnv();
+
     // returns true if an exception is set (and dumps it out to the Log)
     static bool hasException(JNIEnv*);
 
@@ -131,6 +146,10 @@
      * above.
      */
     static SkColor4f convertColorLong(jlong color);
+
+private:
+    /* JNI JavaVM pointer */
+    static JavaVM* mJavaVM;
 };
 
 class HeapAllocator : public SkBRDAllocator {