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

Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-24 15:39:10 +00:00
committed by Android (Google) Code Review
parent 720e68aa08 99114e35ea
commit fb5ea447aa
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
View File

@@ -24,6 +24,7 @@ import android.content.res.TypedArray;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.NotificationHeaderView; import android.view.NotificationHeaderView;
@@ -58,6 +59,8 @@ import java.util.List;
public class NotificationChildrenContainer extends ViewGroup public class NotificationChildrenContainer extends ViewGroup
implements NotificationFadeAware { implements NotificationFadeAware {
private static final String TAG = "NotificationChildrenContainer";
@VisibleForTesting @VisibleForTesting
static final int NUMBER_OF_CHILDREN_WHEN_COLLAPSED = 2; static final int NUMBER_OF_CHILDREN_WHEN_COLLAPSED = 2;
@VisibleForTesting @VisibleForTesting
@@ -1144,6 +1147,10 @@ public class NotificationChildrenContainer extends ViewGroup
private int getMinHeight(int maxAllowedVisibleChildren, boolean likeHighPriority, private int getMinHeight(int maxAllowedVisibleChildren, boolean likeHighPriority,
int headerTranslation) { int headerTranslation) {
if (!likeHighPriority && showingAsLowPriority()) { if (!likeHighPriority && showingAsLowPriority()) {
if (mNotificationHeaderLowPriority == null) {
Log.e(TAG, "getMinHeight: low priority header is null", new Exception());
return 0;
}
return mNotificationHeaderLowPriority.getHeight(); return mNotificationHeaderLowPriority.getHeight();
} }
int minExpandHeight = mNotificationHeaderMargin + headerTranslation; int minExpandHeight = mNotificationHeaderMargin + headerTranslation;
@@ -1160,7 +1167,13 @@ public class NotificationChildrenContainer extends ViewGroup
firstChild = false; firstChild = false;
} }
ExpandableNotificationRow child = mAttachedChildren.get(i); ExpandableNotificationRow child = mAttachedChildren.get(i);
minExpandHeight += child.getSingleLineView().getHeight(); View singleLineView = child.getSingleLineView();
if (singleLineView != null) {
minExpandHeight += singleLineView.getHeight();
} else {
Log.e(TAG, "getMinHeight: child " + child + " single line view is null",
new Exception());
}
visibleChildren++; visibleChildren++;
} }
minExpandHeight += mCollapsedBottomPadding; minExpandHeight += mCollapsedBottomPadding;