diff options
| author | 2020-03-30 09:03:27 +0000 | |
|---|---|---|
| committer | 2020-03-30 09:03:27 +0000 | |
| commit | 1ad1f9938f18528eae6da33ff16a7147fb3a5484 (patch) | |
| tree | 1ea0ea58786d7e6f8d459705adac7515cd1600f4 | |
| parent | c8983dbed73abaa5c6f6a0d5c916221fd50d4d06 (diff) | |
| parent | 28310268d9051b1354eb33035818e2b1651efa4b (diff) | |
Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev
| -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(); + } } /** |