diff options
| -rw-r--r-- | core/java/android/app/ApplicationErrorReport.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/Binder.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/StrictMode.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java index 9f1a539ab240..e6452619b508 100644 --- a/core/java/android/app/ApplicationErrorReport.java +++ b/core/java/android/app/ApplicationErrorReport.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.Binder; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemProperties; @@ -430,7 +431,7 @@ public class ApplicationErrorReport implements Parcelable { dest.writeInt(throwLineNumber); dest.writeString(stackTrace); int total = dest.dataPosition()-start; - if (total > 20*1024) { + if (Binder.CHECK_PARCEL_SIZE && total > 20*1024) { Slog.d("Error", "ERR: exClass=" + exceptionClassName); Slog.d("Error", "ERR: exMsg=" + exceptionMessage); Slog.d("Error", "ERR: file=" + throwFileName); diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 01369791fd38..7906707c0133 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -66,7 +66,8 @@ 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; + /** @hide */ + public static final boolean CHECK_PARCEL_SIZE = false; static final String TAG = "Binder"; /** @hide */ diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index caea2020244c..f503b3a2d33f 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -2638,7 +2638,7 @@ public final class StrictMode { dest.writeString(broadcastIntentAction); dest.writeStringArray(tags); int total = dest.dataPosition()-start; - if (total > 10*1024) { + if (Binder.CHECK_PARCEL_SIZE && total > 10*1024) { Slog.d(TAG, "VIO: policy=" + policy + " dur=" + durationMillis + " numLoop=" + violationNumThisLoop + " anim=" + numAnimationsRunning |