diff --git a/src/api-impl-jni/android_graphics_Bitmap.c b/src/api-impl-jni/android_graphics_Bitmap.c index d4cad64d..d19126c5 100644 --- a/src/api-impl-jni/android_graphics_Bitmap.c +++ b/src/api-impl-jni/android_graphics_Bitmap.c @@ -42,6 +42,9 @@ JNIEXPORT jlong JNICALL Java_android_graphics_Bitmap_native_1bitmap_1from_1path( JNIEXPORT jint JNICALL Java_android_graphics_Bitmap_getWidth(JNIEnv *env, jobject this) { GdkPixbuf *pixbuf = _PTR(_GET_LONG_FIELD(this, "pixbuf")); + if (!pixbuf) { + return 10; + } return gdk_pixbuf_get_width(pixbuf); } @@ -49,6 +52,9 @@ JNIEXPORT jint JNICALL Java_android_graphics_Bitmap_getWidth(JNIEnv *env, jobjec JNIEXPORT jint JNICALL Java_android_graphics_Bitmap_getHeight(JNIEnv *env, jobject this) { GdkPixbuf *pixbuf = _PTR(_GET_LONG_FIELD(this, "pixbuf")); + if (!pixbuf) { + return 10; + } return gdk_pixbuf_get_height(pixbuf); } diff --git a/src/api-impl/android/content/res/TypedArray.java b/src/api-impl/android/content/res/TypedArray.java index 8e66e58d..182410a9 100644 --- a/src/api-impl/android/content/res/TypedArray.java +++ b/src/api-impl/android/content/res/TypedArray.java @@ -719,4 +719,8 @@ public class TypedArray { public String toString() { return Arrays.toString(mData); } + + public int getChangingConfigurations() { + return 0; + } } diff --git a/src/api-impl/android/graphics/Bitmap.java b/src/api-impl/android/graphics/Bitmap.java index fbe7e89f..7f19a925 100644 --- a/src/api-impl/android/graphics/Bitmap.java +++ b/src/api-impl/android/graphics/Bitmap.java @@ -1251,7 +1251,8 @@ public final class Bitmap { * that config, otherwise return null. */ public final Config getConfig() { - return Config.nativeToConfig(nativeConfig(mNativeBitmap)); + // return Config.nativeToConfig(nativeConfig(mNativeBitmap)); + return Config.ARGB_8888; } /** diff --git a/src/api-impl/android/graphics/drawable/Drawable.java b/src/api-impl/android/graphics/drawable/Drawable.java index 1689bb1e..e1a41e4b 100644 --- a/src/api-impl/android/graphics/drawable/Drawable.java +++ b/src/api-impl/android/graphics/drawable/Drawable.java @@ -13,10 +13,12 @@ import org.xmlpull.v1.XmlPullParserException; import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.XmlResourceParser; +import android.content.res.Resources.Theme; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.PorterDuff; import android.graphics.Rect; +import android.util.AttributeSet; import android.util.TypedValue; public class Drawable { @@ -131,6 +133,10 @@ public class Drawable { return null; } + public static Drawable createFromXmlInner(Resources resources, XmlPullParser parser, AttributeSet attrs, Theme theme) { + return null; + } + public static Drawable createFromResourceStream(Resources resources, TypedValue value, InputStream is, String file, Object object) { Path path = Paths.get(android.os.Environment.getExternalStorageDirectory().getPath(), file);