diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-16 06:07:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 06:07:31 +0000 |
| commit | 499127eab812088ca24421b59ebfac6f47ea850f (patch) | |
| tree | 82fa5cc40a57fe2e19e5525b9dc3d1989aa196e9 /libs/binder | |
| parent | e52299e76e8515a387c216bda61af88a8bc31ed5 (diff) | |
| parent | 8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc (diff) | |
| download | frameworks_native-499127eab812088ca24421b59ebfac6f47ea850f.zip frameworks_native-499127eab812088ca24421b59ebfac6f47ea850f.tar.gz frameworks_native-499127eab812088ca24421b59ebfac6f47ea850f.tar.bz2 | |
am 8f3ade0c: Merge "Follow StrictMode refactoring."
* commit '8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
Follow StrictMode refactoring.
Diffstat (limited to 'libs/binder')
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 0ff9045..2c566f9 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -57,7 +57,7 @@ #define PAD_SIZE(s) (((s)+3)&~3) // Note: must be kept in sync with android/os/StrictMode.java's PENALTY_GATHER -#define STRICT_MODE_PENALTY_GATHER 0x100 +#define STRICT_MODE_PENALTY_GATHER (0x40 << 16) // Note: must be kept in sync with android/os/Parcel.java's EX_HAS_REPLY_HEADER #define EX_HAS_REPLY_HEADER -128 |