From e1abceee8551e56d2afb588c0171b7e801f0a061 Mon Sep 17 00:00:00 2001 From: Mis012 Date: Sun, 14 Apr 2024 15:15:37 +0200 Subject: [PATCH] api-impl: more stubs to make OsmAnd launch with latest bionic_translation, OsmAnd doesn't crash in native code --- .../generated_headers/android_graphics_Bitmap.h | 8 -------- src/api-impl/android/graphics/Bitmap.java | 3 +-- src/api-impl/android/view/Window.java | 5 +++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h b/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h index a38db9f4..6e6d8769 100644 --- a/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h +++ b/src/api-impl-jni/generated_headers/android_graphics_Bitmap.h @@ -195,14 +195,6 @@ JNIEXPORT jobject JNICALL Java_android_graphics_Bitmap_nativeExtractAlpha JNIEXPORT void JNICALL Java_android_graphics_Bitmap_nativePrepareToDraw (JNIEnv *, jclass, jint); -/* - * Class: android_graphics_Bitmap - * Method: nativeHasAlpha - * Signature: (I)Z - */ -JNIEXPORT jboolean JNICALL Java_android_graphics_Bitmap_nativeHasAlpha - (JNIEnv *, jclass, jint); - /* * Class: android_graphics_Bitmap * Method: nativeSetAlphaAndPremultiplied diff --git a/src/api-impl/android/graphics/Bitmap.java b/src/api-impl/android/graphics/Bitmap.java index f1f6d235..d49a610a 100644 --- a/src/api-impl/android/graphics/Bitmap.java +++ b/src/api-impl/android/graphics/Bitmap.java @@ -1261,7 +1261,7 @@ public final class Bitmap { * it will return true by default. */ public final boolean hasAlpha() { - return nativeHasAlpha(mNativeBitmap); + return true; // we only support ARGB_8888 } /** @@ -1637,7 +1637,6 @@ public final class Bitmap { int[] offsetXY); private static native void nativePrepareToDraw(int nativeBitmap); - private static native boolean nativeHasAlpha(int nativeBitmap); private static native void nativeSetAlphaAndPremultiplied(int nBitmap, boolean hasAlpha, boolean isPremul); private static native boolean nativeHasMipMap(int nativeBitmap); diff --git a/src/api-impl/android/view/Window.java b/src/api-impl/android/view/Window.java index d5992d5f..ee8a7061 100644 --- a/src/api-impl/android/view/Window.java +++ b/src/api-impl/android/view/Window.java @@ -23,7 +23,6 @@ public class Window { public boolean onMenuOpened(int featureId, Menu menu); } - // FIXME private public long native_window; public View contentView; @@ -99,5 +98,7 @@ public class Window { public void setNavigationBarColor(int color) {} - public void setFormat (int format) {} + public void setFormat(int format) {} + + public void setLayout(int dummy, int dummy2) {} }