summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/Binder.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-09-29 10:52:47 -0700
committerDianne Hackborn <hackbod@google.com>2014-09-29 16:04:02 -0700
commit73d6a821aeecd6003c70c32f7ae6c38f062c4290 (patch)
tree9c3ca15e7571f1b63e8d793d666b6893d909ffbd /core/java/android/os/Binder.java
parent9eef5bf8d1a69879ada3176c839676dc82b14daf (diff)
downloadframeworks_base-73d6a821aeecd6003c70c32f7ae6c38f062c4290.zip
frameworks_base-73d6a821aeecd6003c70c32f7ae6c38f062c4290.tar.gz
frameworks_base-73d6a821aeecd6003c70c32f7ae6c38f062c4290.tar.bz2
Work on issue #17656716: Unhandled exception in Window Manager
Remove the checks for large parcel sizes. Those were triggering, and identifyng the area of the problem, but also cause a lot of trouble by making the unsafe deadlocky code there much more likely to deadlock. Add logging for strict mode IPCs, since those seem to be the problem. Only log when things look bad. Also add a log when battery stats are reset, to diagnose why they are getting reset when they shouldn't be. Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
Diffstat (limited to 'core/java/android/os/Binder.java')
-rw-r--r--core/java/android/os/Binder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index cb5a31c..f5fc0d7 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -49,6 +49,7 @@ public class Binder implements IBinder {
* of classes can potentially create leaks.
*/
private static final boolean FIND_POTENTIAL_LEAKS = false;
+ private static final boolean CHECK_PARCEL_SIZE = false;
static final String TAG = "Binder";
/**
@@ -388,7 +389,7 @@ public class Binder implements IBinder {
}
static void checkParcel(IBinder obj, int code, Parcel parcel, String msg) {
- if (parcel.dataSize() >= 800*1024) {
+ if (CHECK_PARCEL_SIZE && parcel.dataSize() >= 800*1024) {
// Trying to send > 800k, this is way too much
StringBuilder sb = new StringBuilder();
sb.append(msg);