commit | 4ef6b6d1f3b6d4a8770525adeee842519d283039 | [log] [tgz] |
---|---|---|
author | Beth Thibodeau <ethibodeau@google.com> | Tue Jul 30 12:22:34 2019 -0400 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Jul 30 21:44:16 2019 +0000 |
tree | 12ab225a55991fb5b099403c9dc3de8e34147a7d | |
parent | e5f386b2d76d91ae379f8f75fc332b7709ad4070 [diff] |
Adding null checks Fixes: 138638813 Test: manual, atest NotificationMediaTemplateViewWrapperTest Change-Id: Ib74cf6109e4ee7e8a353f5537b566e50130bc403 (cherry picked from commit ce92d3370cb853214c0eedec3784e67f905d576c)
diff --git a/core/java/com/android/internal/widget/MediaNotificationView.java b/core/java/com/android/internal/widget/MediaNotificationView.java index 0d87afa..9bb4501 100644 --- a/core/java/com/android/internal/widget/MediaNotificationView.java +++ b/core/java/com/android/internal/widget/MediaNotificationView.java
@@ -175,8 +175,10 @@ @Override public void onVisibilityAggregated(boolean isVisible) { super.onVisibilityAggregated(isVisible); - for (int i = 0; i < mListeners.size(); i++) { - mListeners.get(i).onAggregatedVisibilityChanged(isVisible); + if (mListeners != null) { + for (int i = 0; i < mListeners.size(); i++) { + mListeners.get(i).onAggregatedVisibilityChanged(isVisible); + } } }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java index 38f9bff..e499814 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationMediaTemplateViewWrapper.java
@@ -95,7 +95,7 @@ @Override public void onAggregatedVisibilityChanged(boolean isVisible) { mIsViewVisible = isVisible; - if (isVisible) { + if (isVisible && mMediaController != null) { // Restart timer if we're currently playing and didn't already have one going PlaybackState state = mMediaController.getPlaybackState(); if (state != null && state.getState() == PlaybackState.STATE_PLAYING