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

Change-Id: I879bd22a26884a5931aee8d1cfd863b1e3253c9f
2020-03-30 09:05:45 +00:00
parent 2e36e2907f 1ad1f9938f
commit c644584570
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();
+        }
    }

    /**