diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-03 11:26:40 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-10-03 11:43:10 -0700 |
| commit | d867b7c7a2c8c151c01b57597b6612ca5355a51a (patch) | |
| tree | 2cf9593f90dff96f111c57eecc9cd859ae46963d /core/java/android | |
| parent | 1e2e4307ff381e5cb9d8d19eb6a1aca763ba9415 (diff) | |
| download | frameworks_base-d867b7c7a2c8c151c01b57597b6612ca5355a51a.zip frameworks_base-d867b7c7a2c8c151c01b57597b6612ca5355a51a.tar.gz frameworks_base-d867b7c7a2c8c151c01b57597b6612ca5355a51a.tar.bz2 | |
Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
...'java.lang.String java.lang.String.substring(int)' on a null object reference
Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
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 |