am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...

* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
This commit is contained in:
Dianne Hackborn
2014-10-03 19:21:06 +00:00
committed by Android Git Automerger

View File

@@ -1725,7 +1725,7 @@ public final class StrictMode {
for (int i = 0; i < numViolations; ++i) {
if (LOG_V) Log.d(TAG, "strict mode violation stacks read from binder call. i=" + i);
ViolationInfo info = new ViolationInfo(p, !currentlyGathering);
if (info.crashInfo.stackTrace.length() > 10000) {
if (info.crashInfo.stackTrace != null && info.crashInfo.stackTrace.length() > 10000) {
// 10000 characters is way too large for this to be any sane kind of
// strict mode collection of stacks. We've had a problem where we leave
// strict mode violations associated with the thread, and it keeps tacking