Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev (804ff964) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -453,9 +453,12 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL
		mReleaseOnExpandFinish = false;
		} else {
		for (NotificationData.Entry entry : mEntriesToRemoveAfterExpand) {
		if (isHeadsUp(entry.key)) {
		// Maybe the heads-up was removed already
		removeHeadsUpEntry(entry);
		}
		}
		}
		mEntriesToRemoveAfterExpand.clear();
		}

		@@ -572,6 +575,9 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL
		earliestRemovaltime = currentTime + mMinimumDisplayTime;
		postTime = Math.max(postTime, currentTime);
		removeAutoRemovalCallbacks();
		if (mEntriesToRemoveAfterExpand.contains(entry)) {
		mEntriesToRemoveAfterExpand.remove(entry);
		}
		if (!hasFullScreenIntent(entry)) {
		long finishTime = postTime + mHeadsUpNotificationDecay;
		long removeDelay = Math.max(finishTime - currentTime, mMinimumDisplayTime);