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

Merge "Fix NPE when content visibility changes" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-20 00:54:42 +00:00
committed by Android (Google) Code Review
parent 4acc0902c6 c12d38f0b3
commit e39c2e7e61
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
View File

@@ -64,6 +64,7 @@ import com.android.systemui.statusbar.policy.SmartReplyView;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList;
/** /**
* A frame layout containing the actual payload of the notification, including the contracted, * A frame layout containing the actual payload of the notification, including the contracted,
@@ -518,9 +519,12 @@ public class NotificationContentView extends FrameLayout {
protected void onVisibilityChanged(View changedView, int visibility) { protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility); super.onVisibilityChanged(changedView, visibility);
updateVisibility(); updateVisibility();
if (visibility != VISIBLE) { if (visibility != VISIBLE && !mOnContentViewInactiveListeners.isEmpty()) {
// View is no longer visible so all content views are inactive. // View is no longer visible so all content views are inactive.
for (Runnable r : mOnContentViewInactiveListeners.values()) { // Clone list as runnables may modify the list of listeners
ArrayList<Runnable> listeners = new ArrayList<>(
mOnContentViewInactiveListeners.values());
for (Runnable r : listeners) {
r.run(); r.run();
} }
mOnContentViewInactiveListeners.clear(); mOnContentViewInactiveListeners.clear();