diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-16 01:10:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-16 01:10:52 +0000 |
| commit | 8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc (patch) | |
| tree | b3ce3809b5a15b582b9f26c91d574e23e68d1573 /libs/binder | |
| parent | 1d4638838aa09b157a68cb3580b8194f8736b880 (diff) | |
| parent | 0c1f5cbb8a41d19195ab49dcfeb5caaea2d3fcda (diff) | |
| download | frameworks_native-8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc.zip frameworks_native-8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc.tar.gz frameworks_native-8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc.tar.bz2 | |
Merge "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 c526399..80c5d7e 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -56,7 +56,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 |