Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 936bf1b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight"... 

Merge "Avert potential crashes in NotificationChildrenContainer.getMinHeight" into tm-dev am: fb5ea447 am: 0f7b1882 am: 5b331394

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557779



Change-Id: I427e2a0c9863d9005d74db2fd2b30bc1e296ac9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf57c5ef 5b331394

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

+14 −1
Original line number Original line Diff line number Diff line
@@ -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;