Commit 708996bd authored Mar 30, 2020 by JW Wang Committed by Automerger Merge Worker Mar 30, 2020

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

Merge "Fix an NPE in WatchdogEventLogger#stop" into rvc-dev am: 1ad1f993 am: c6445845 am: 380c73f7 am: d6688e71

Change-Id: Id180ed4e2bc2aa9a3be048778c4514db47d438ba

parents 8329be18 d6688e71

tests/RollbackTest/lib/src/com/android/tests/rollback/host/WatchdogEventLogger.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -36,9 +36,11 @@ public class WatchdogEventLogger {
		}

		public void stop() {
		if (mReceiver != null) {
		mReceiver.stop();
		mReceiver.clear();
		}
		}

		/**
		* Returns a list of all Watchdog logging events which have occurred.