NoMan: Allow notifications to transition !ZEN -> ZEN (d5092bcb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1873,10 +1873,9 @@ public class NotificationManagerService extends SystemService {
	}		}
	}		}

	// let zen mode evaluate this record and then make note of that for the future		// let zen mode evaluate this record
	private void applyZenModeLocked(NotificationRecord record) {		private void applyZenModeLocked(NotificationRecord record) {
	record.setIntercepted(mZenModeHelper.shouldIntercept(record, record.wasTouchedByZen()));		record.setIntercepted(mZenModeHelper.shouldIntercept(record));
	record.setTouchedByZen();
	}		}

	// lock on mNotificationList		// lock on mNotificationList

services/core/java/com/android/server/notification/NotificationRecord.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -51,8 +51,6 @@ public final class NotificationRecord {

	// is this notification currently being intercepted by Zen Mode?		// is this notification currently being intercepted by Zen Mode?
	private boolean mIntercept;		private boolean mIntercept;
	// InterceptedNotifications needs to know if this has been previously evaluated.
	private boolean mTouchedByZen;

	// The timestamp used for ranking.		// The timestamp used for ranking.
	private long mRankingTimeMs;		private long mRankingTimeMs;
	@@ -71,7 +69,6 @@ public final class NotificationRecord {
	public void copyRankingInformation(NotificationRecord previous) {		public void copyRankingInformation(NotificationRecord previous) {
	mContactAffinity = previous.mContactAffinity;		mContactAffinity = previous.mContactAffinity;
	mRecentlyIntrusive = previous.mRecentlyIntrusive;		mRecentlyIntrusive = previous.mRecentlyIntrusive;
	mTouchedByZen = previous.mTouchedByZen;
	mIntercept = previous.mIntercept;		mIntercept = previous.mIntercept;
	mRankingTimeMs = calculateRankingTimeMs(previous.getRankingTimeMs());		mRankingTimeMs = calculateRankingTimeMs(previous.getRankingTimeMs());
	}		}
	@@ -204,14 +201,6 @@ public final class NotificationRecord {
	return mIntercept;		return mIntercept;
	}		}

	public boolean wasTouchedByZen() {
	return mTouchedByZen;
	}

	public void setTouchedByZen() {
	mTouchedByZen = true;
	}

	/**		/**
	* Returns the timestamp to use for time-based sorting in the ranker.		* Returns the timestamp to use for time-based sorting in the ranker.
	*/		*/

services/core/java/com/android/server/notification/ZenModeHelper.java

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -129,12 +129,8 @@ public class ZenModeHelper {
	mCallbacks.add(callback);		mCallbacks.add(callback);
	}		}

	public boolean shouldIntercept(NotificationRecord record, boolean previouslySeen) {		public boolean shouldIntercept(NotificationRecord record) {
	if (mZenMode != Global.ZEN_MODE_OFF) {		if (mZenMode != Global.ZEN_MODE_OFF) {
	if (previouslySeen && !record.isIntercepted()) {
	// notifications never transition from not intercepted to intercepted
	return false;
	}
	if (isSystem(record)) {		if (isSystem(record)) {
	return false;		return false;
	}		}