Add mEglCore release and set it to null in shutdown of VDE. And revert change in Texture2dProgram

2 files changed, 5 insertions, 1 deletions

diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java
index 3c2606dad..1faed6776 100644
--- a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java
+++ b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java
@@ -162,7 +162,7 @@ public class Texture2dProgram {
         if (mProgramHandle == 0) {
             throw new RuntimeException("Unable to create program");
         }
-        Log.i(TAG,"Created program " + mProgramHandle + " (" + programType + ")");
+        Log.e(TAG,"Created program " + mProgramHandle + " (" + programType + ")");
 
         // get locations of attributes and uniforms
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index 03586598e..0f6b6b02d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -251,6 +251,10 @@ public class VirtualDisplayEncoder {
                 inputSurface.release();
                 inputSurface = null;
             }
+            if (mEglCore != null) {
+                mEglCore.release();
+                mEglCore = null;
+            }
         } catch (Exception ex) {
             DebugTool.logError(TAG, "shutDown() failed");
         }