Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev am: 1ad1f9938f am: c644584570 am: 380c73f752

Change-Id: Ife3b9cb550c20f07f051f80ed924e641f8cff334
2020-03-30 09:30:43 +00:00
parent 872861e221 380c73f752
commit d6688e71e8
1 changed files with 4 additions and 2 deletions
--- 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();
+        }
    }

    /**