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

Commit d34c1495 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Prevent system crash when OOM in Binder thread."

parents 11dba787 19f22745

core/java/android/os/Binder.java

+4 −0
Original line number Diff line number Diff line
@@ -292,6 +292,10 @@ public class Binder implements IBinder { 
        } catch (RuntimeException e) {

            reply.writeException(e);

            res = true;

        } catch (OutOfMemoryError e) {

            RuntimeException re = new RuntimeException("Out of memory", e);

            reply.writeException(re);

            res = true;

        }

        reply.recycle();

        data.recycle();