Skip to content

Commit b7f9745

Browse files
committed
handle some NPEs Android2D
1 parent 6ae45c9 commit b7f9745

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

core/src/processing/core/PGraphicsAndroid2D.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.zip.GZIPInputStream;
2727

2828
import processing.data.XML;
29+
import android.app.Activity;
2930
import android.app.ActivityManager;
3031
import android.app.ActivityManager.MemoryInfo;
3132
import android.graphics.*;
@@ -147,7 +148,7 @@ protected void allocate() {
147148

148149
@Override
149150
public void dispose() {
150-
bitmap.recycle();
151+
if (bitmap != null) bitmap.recycle();
151152
}
152153

153154

@@ -1089,7 +1090,9 @@ protected void imageImpl(PImage src,
10891090
// but I don't think it is particularly efficient, as the bitmaps are stored
10901091
// in native heap for Android 10 and older.
10911092
MemoryInfo mi = new MemoryInfo();
1092-
ActivityManager activityManager = (ActivityManager) parent.getActivity().getSystemService(android.content.Context.ACTIVITY_SERVICE);
1093+
Activity activity = parent.getActivity();
1094+
if (activity == null) return;
1095+
ActivityManager activityManager = (ActivityManager) activity.getSystemService(android.content.Context.ACTIVITY_SERVICE);
10931096
activityManager.getMemoryInfo(mi);
10941097
if (mi.lowMemory) {
10951098
src.bitmap.recycle();

0 commit comments

Comments
 (0)