Merge "Possibly fix bad notification updates." into honeycomb (f4699efb) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -574,7 +574,15 @@ public class Notification implements Parcelable
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder();
		sb.append("Notification(vibrate=");
		sb.append("Notification(contentView=");
		if (contentView != null) {
		sb.append(contentView.getPackage());
		sb.append("/0x");
		sb.append(Integer.toHexString(contentView.getLayoutId()));
		} else {
		sb.append("null");
		}
		sb.append(" vibrate=");
		if (this.vibrate != null) {
		int N = this.vibrate.length-1;
		sb.append("[");

+5 −5

Original line number	Diff line number	Diff line
		@@ -598,18 +598,18 @@ public class TabletStatusBar extends StatusBar implements

		// Can we just reapply the RemoteViews in place? If when didn't change, the order
		// didn't change.
		boolean orderUnchanged = (notification.notification.when == oldNotification.notification.when
		&& notification.isOngoing() == oldNotification.isOngoing()
		boolean contentsUnchanged = notification.isOngoing() == oldNotification.isOngoing()
		&& oldEntry.expanded != null
		&& contentView != null
		&& oldContentView != null
		&& contentView.getPackage() != null
		&& oldContentView.getPackage() != null
		&& oldContentView.getPackage().equals(contentView.getPackage())
		&& oldContentView.getLayoutId() == contentView.getLayoutId());
		&& oldContentView.getLayoutId() == contentView.getLayoutId();
		ViewGroup rowParent = (ViewGroup) oldEntry.row.getParent();
		boolean orderUnchanged = notification.notification.when==oldNotification.notification.when;
		boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount()-1;
		if (orderUnchanged \|\| isLastAnyway) {
		if (contentsUnchanged && (orderUnchanged \|\| isLastAnyway)) {
		if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key);
		oldEntry.notification = notification;
		try {

+1 −1