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

Commit 74923d3a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am d34c1495: Merge "Prevent system crash when OOM in Binder thread." 

* commit 'd34c1495':
  Prevent system crash when OOM in Binder thread.
parents 218e0033 d34c1495

core/java/android/os/Binder.java

+4 −0
Original line number Diff line number Diff line
@@ -324,6 +324,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();