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

Change-Id: I0544fa949a3f976c89bb301c52ed97fe04a0ccfb
2020-03-30 09:13:10 +00:00
parent 63fb5f113f c644584570
commit 380c73f752
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();
+        }
    }

    /**