Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev

2020-03-30 09:03:27 +00:00
parent c8983dbed7 28310268d9
commit 1ad1f9938f
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();
+        }
    }

    /**