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

Commit a8a4d29a authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0 

am: 804ff964

* commit '804ff964':
  Fixed a crash with the heads up manager
parents 10510820 804ff964

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -453,9 +453,12 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
            mReleaseOnExpandFinish = false;

            mReleaseOnExpandFinish = false;

        } else {

        } else {

            for (NotificationData.Entry entry : mEntriesToRemoveAfterExpand) {

            for (NotificationData.Entry entry : mEntriesToRemoveAfterExpand) {

                if (isHeadsUp(entry.key)) {

                    // Maybe the heads-up was removed already

                    removeHeadsUpEntry(entry);

                    removeHeadsUpEntry(entry);

                }

                }

            }

            }

        }

        mEntriesToRemoveAfterExpand.clear();

        mEntriesToRemoveAfterExpand.clear();

    }

    }
@@ -572,6 +575,9 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
            earliestRemovaltime = currentTime + mMinimumDisplayTime;

            earliestRemovaltime = currentTime + mMinimumDisplayTime;

            postTime = Math.max(postTime, currentTime);

            postTime = Math.max(postTime, currentTime);

            removeAutoRemovalCallbacks();

            removeAutoRemovalCallbacks();

            if (mEntriesToRemoveAfterExpand.contains(entry)) {

                mEntriesToRemoveAfterExpand.remove(entry);

            }

            if (!hasFullScreenIntent(entry)) {

            if (!hasFullScreenIntent(entry)) {

                long finishTime = postTime + mHeadsUpNotificationDecay;

                long finishTime = postTime + mHeadsUpNotificationDecay;

                long removeDelay = Math.max(finishTime - currentTime, mMinimumDisplayTime);

                long removeDelay = Math.max(finishTime - currentTime, mMinimumDisplayTime);