Merge "Clear the Parcel before writing an exception during a transaction" into qt-dev am: d2111df37b

am: 36a573e14d

Change-Id: I5e08458d2f66a726351f4481e7759dfd6971eb5f

core/java/android/os/Binder.java

@@ -1033,6 +1033,8 @@ public class Binder implements IBinder {
                     Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);
                 }
             } else {
+                // Clear the parcel before writing the exception
+                reply.setDataSize(0);
                 reply.setDataPosition(0);
                 reply.writeException(e);
             }