ANDROID: fix issue with crash on minimise with googleos

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2019-08-19 (0.12.15)
+	ANDROID: fix issue with crash on minimise with googleos
+	ANDROID: update to androidx
+
 2019-07-27 (0.12.15)
 	SDL: added -n command line option to run then not pause for back key
 

src/platform/android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdkVersion 27
+  compileSdkVersion 28
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
@@ -47,6 +47,6 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:support-compat:27.1.1'
+  implementation 'androidx.core:core:1.0.0'
   testImplementation 'junit:junit:4.12'
 }

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -24,9 +24,9 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;

src/platform/android/build.gradle

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

src/platform/android/gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

src/platform/android/jni/display.cpp

@@ -143,7 +143,7 @@ bool Graphics::construct(int fontId) {
     if (_screen && _screen->create(_w, _h)) {
       _drawTarget = _screen;
       maSetColor(DEFAULT_BACKGROUND);
-      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, WINDOW_FORMAT_RGBA_8888);
+      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
       result = true;
     } else {
       trace("Failed to create canvas");
@@ -157,18 +157,33 @@ bool Graphics::construct(int fontId) {
 void Graphics::redraw() {
   if (_app->window != NULL && !_paused) {
     ANativeWindow_Buffer buffer;
-    if (ANativeWindow_lock(_app->window, &buffer, NULL) < 0) {
+    bool locked = ANativeWindow_lock(_app->window, &buffer, NULL) == 0;
+    if (!locked) {
       trace("Unable to lock window buffer");
     } else {
-      void *pixels = buffer.bits;
-      int width = MIN(_w, MIN(buffer.width, _screen->_w));
-      int height = MIN(_h, MIN(buffer.height, _screen->_h));
-      for (int y = 0; y < height; y++) {
-        pixel_t *line = _screen->getLine(y);
-        memcpy((pixel_t *)pixels, line, width * sizeof(pixel_t));
-        pixels = (pixel_t*)pixels + buffer.stride;
+      if (buffer.format != AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM) {
+        ANativeWindow_unlockAndPost(_app->window);
+        ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
+        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));
+        int height = MIN(_h, MIN(buffer.height, _screen->_h));
+        for (int y = 0; y < height; y++) {
+          pixel_t *line = _screen->getLine(y);
+          memcpy((pixel_t *)pixels, line, width * sizeof(pixel_t));
+          pixels = (pixel_t*)pixels + buffer.stride;
+        }
+        ANativeWindow_unlockAndPost(_app->window);
       }
-      ANativeWindow_unlockAndPost(_app->window);
     }
   }
 }