diff options
| author | JW Wang <wangchun@google.com> | 2020-03-30 10:19:36 +0800 |
|---|---|---|
| committer | JW Wang <wangchun@google.com> | 2020-03-30 10:19:36 +0800 |
| commit | 28310268d9051b1354eb33035818e2b1651efa4b (patch) | |
| tree | ee87e68bd3beb4af542890ef00639c0e6522791d /tests/RollbackTest | |
| parent | 9cb593704e34330eaa051865358f34d177b740c0 (diff) | |
Fix an NPE in WatchdogEventLogger#stop
See b/152550404#comment15.
https://cs.corp.google.com/android/frameworks/base/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java?rcl=0b9230489ead3a2ad328d46a47194cfa9dffd25c&l=86
My theory is that somehow #setUp throws before calling mLogger.start()
and then mLogger.stop() runs into an NPE.
Let's add a null-check in the hope that the actual root cause will stand
out.
Bug: 152550404
Test: atest StagedRollbackTest
Change-Id: Ifd323e6a8707a2de19d03ecbe536feacdbb4e9c6
Diffstat (limited to 'tests/RollbackTest')
| -rw-r--r-- | tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java b/tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java index 317d67e3791e..88731504eafe 100644 --- a/tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java +++ b/tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java @@ -36,8 +36,10 @@ public class WatchdogEventLogger { } public void stop() { - mReceiver.stop(); - mReceiver.clear(); + if (mReceiver != null) { + mReceiver.stop(); + mReceiver.clear(); + } } /** |