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

core/java/android/os/Binder.java

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