diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-03 21:32:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 21:32:30 +0000 |
| commit | 6b1cf642fc5bda2dfaea2571b24241bd3c2109b4 (patch) | |
| tree | 7cc5816e150bad7e10eb4a45a1f2c7cdd645822f /core/java/android | |
| parent | d019b19e2bd626564c016d65b33aa2e8b9020407 (diff) | |
| parent | 5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5 (diff) | |
| download | frameworks_base-6b1cf642fc5bda2dfaea2571b24241bd3c2109b4.zip frameworks_base-6b1cf642fc5bda2dfaea2571b24241bd3c2109b4.tar.gz frameworks_base-6b1cf642fc5bda2dfaea2571b24241bd3c2109b4.tar.bz2 | |
am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/StrictMode.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 0ee8d86f..47ea732 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -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 |