Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Wakefullness lifecycle NPE"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-21 21:57:26 +00:00
committed by Android (Google) Code Review
parent ecb0793d02 48f269b539
commit 1edde74f9e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/keyguard/Lifecycle.java
View File

@@ -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) {

6
packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
View File

@@ -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);
}
}