ANDROID: fix ChromeOS crash when restarting over existing instance

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2019-08-23 (0.12.15)
+	ANDROID: fix ChromeOS crash when restarting over existing instance
+
 2019-08-19 (0.12.15)
 	ANDROID: fix issue with crash on minimise with ChromeOS
 	ANDROID: fix permission issue with share command

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.4.2'
+    classpath 'com.android.tools.build:gradle:3.5.0'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }

src/platform/android/jni/display.cpp

@@ -167,12 +167,6 @@ void Graphics::redraw() {
         locked = ANativeWindow_lock(_app->window, &buffer, NULL) == 0;
         trace("Restore format %d", locked);
       }
-      if (buffer.format != AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM) {
-        ANativeWindow_unlockAndPost(_app->window);
-        ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
-        locked = false;
-        trace("Restore format failed");
-      }
       if (locked) {
         void *pixels = buffer.bits;
         int width = MIN(_w, MIN(buffer.width, _screen->_w));

src/platform/android/jni/runtime.cpp

@@ -37,7 +37,7 @@
 #define GBOARD_KEY_QUESTION 274
 #define EVENT_TYPE_EXIT 100
 
-Runtime *runtime;
+Runtime *runtime = NULL;
 
 MAEvent *getMotionEvent(int type, AInputEvent *event) {
   MAEvent *result = new MAEvent();
@@ -203,6 +203,10 @@ Runtime::Runtime(android_app *app) :
   _app->onAppCmd = handleCommand;
   _app->onInputEvent = handleInput;
   _app->inputPollSource.process = process_input;
+  if (runtime != NULL) {
+    trace("another instance is still active");
+    _state = kClosingState;
+  }
   runtime = this;
   pthread_mutex_init(&_mutex, NULL);
   _looper = ALooper_forThread();