Merge "Fix Wakefullness lifecycle NPE" (1edde74f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/Lifecycle.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@

		package com.android.systemui.keyguard;

		import androidx.annotation.NonNull;

		import java.util.ArrayList;
		import java.util.Objects;
		import java.util.function.Consumer;

		/**
		@@ -26,8 +29,8 @@ public class Lifecycle<T> {

		private ArrayList<T> mObservers = new ArrayList<>();

		public void addObserver(T observer) {
		mObservers.add(observer);
		public void addObserver(@NonNull T observer) {
		mObservers.add(Objects.requireNonNull(observer));
		}

		public void removeObserver(T observer) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -122,4 +122,8 @@ public class WakefulnessLifecycleTest extends SysuiTestCase {
		mWakefulness.dump(null, new PrintWriter(new ByteArrayOutputStream()), new String[0]);
		}

		@Test(expected = NullPointerException.class)
		public void throwNPEOnNullObserver() {
		mWakefulness.addObserver(null);
		}
		}