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

* commit '74923d3ae4bf7043a62a02c4df988ef3255737ce':
  Prevent system crash when OOM in Binder thread.

core/java/android/os/Binder.java

@@ -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();