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

Commit 6d26cf16 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Clear the Parcel before writing an exception during a transaction" into... 

Merge "Clear the Parcel before writing an exception during a transaction" into qt-dev am: d2111df3 am: 36a573e1
am: 3b5a31d1

Change-Id: Ic1773b058003291bff6e3fd1b47b998838d6715d
parents 820faf44 3b5a31d1

core/java/android/os/Binder.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -1033,6 +1033,8 @@ public class Binder implements IBinder { 
                    Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);

                    Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);

                }

                }

            } else {

            } else {

                // Clear the parcel before writing the exception

                reply.setDataSize(0);

                reply.setDataPosition(0);

                reply.setDataPosition(0);

                reply.writeException(e);

                reply.writeException(e);

            }

            }