Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev (0c5ec0e0) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.

		private NotificationData.Entry mHeadsUp;
		private int mUser;
		private String mMostRecentPackageName;

		public HeadsUpNotificationView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		@@ -117,6 +118,7 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
		}

		if (mHeadsUp != null) {
		mMostRecentPackageName = mHeadsUp.notification.getPackageName();
		mHeadsUp.row.setSystemExpanded(true);
		mHeadsUp.row.setSensitive(false);
		mHeadsUp.row.setHeadsUp(true);
		@@ -198,8 +200,10 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper.
		}

		private void snooze() {
		mSnoozedPackages.put(snoozeKey(mHeadsUp.notification.getPackageName(), mUser),
		if (mMostRecentPackageName != null) {
		mSnoozedPackages.put(snoozeKey(mMostRecentPackageName, mUser),
		SystemClock.elapsedRealtime() + mSnoozeLengthMs);
		}
		releaseAndClose();
		}