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

Commit 64bdb3c9 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder... 

am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread

Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp

* commit '1772c34e5331a6456c8a93051192d19ff873c062':
  StrictMode: gather and return violating stacks in Binder replies
parents 7f7fa79c 48d2d653

libs/binder/Parcel.cpp

+12 −1
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ 
// Note: must be kept in sync with android/os/StrictMode.java's PENALTY_GATHER

#define STRICT_MODE_PENALTY_GATHER 0x100



// Note: must be kept in sync with android/os/Parcel.java's EX_HAS_REPLY_HEADER

#define EX_HAS_REPLY_HEADER -128



// XXX This can be made public if we want to provide

// support for typed data.

struct small_flat_data
@@ -959,7 +962,15 @@ wp<IBinder> Parcel::readWeakBinder() const 
int32_t Parcel::readExceptionCode() const

{

  int32_t exception_code = readAligned<int32_t>();

  // TODO: skip over the response header here, once that's in.

  if (exception_code == EX_HAS_REPLY_HEADER) {

    int32_t header_size = readAligned<int32_t>();

    // Skip over fat responses headers.  Not used (or propagated) in

    // native code

    setDataPosition(dataPosition() + header_size);

    // And fat response headers are currently only used when there are no

    // exceptions, so return no error:

    return 0;

  }

  return exception_code;

}