Skip to content

Commit d34c149

Browse files
Jean-Baptiste QueruAndroid Code Review
authored andcommitted
Merge "Prevent system crash when OOM in Binder thread."
2 parents 11dba78 + 19f2274 commit d34c149

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

core/java/android/os/Binder.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@ private boolean execTransact(int code, int dataObj, int replyObj,
292292
} catch (RuntimeException e) {
293293
reply.writeException(e);
294294
res = true;
295+
} catch (OutOfMemoryError e) {
296+
RuntimeException re = new RuntimeException("Out of memory", e);
297+
reply.writeException(re);
298+
res = true;
295299
}
296300
reply.recycle();
297301
data.recycle();

0 commit comments

Comments
 (0)