Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e609b0c8 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Make getDataSpace fail instead of crash on recycled"

parents b44e3d72 f8e41c5f
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -33,10 +33,14 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,

int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) {
    if (NULL == env || NULL == jbitmap) {
        return ADATASPACE_UNKNOWN; // Or return a real error?
        return ADATASPACE_UNKNOWN;
    }

    android::graphics::Bitmap bitmap(env, jbitmap);
    if (!bitmap.isValid()) {
        return ADATASPACE_UNKNOWN;
    }

    return bitmap.getDataSpace();
}