SystemUI: Fix crash from bad notifications (9385517f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -961,7 +961,6 @@ public abstract class BaseStatusBar extends SystemUI implements
		mNotificationGutsExposed = entry.row.getGuts();
		bindGuts(entry.row);
		}
		entry.cacheContentViews(mContext, null /* updatedNotification */);
		inflateViews(entry, mStackScroller);
		}
		}
		@@ -1585,7 +1584,12 @@ public abstract class BaseStatusBar extends SystemUI implements
		entry.notification.getUser().getIdentifier());

		final StatusBarNotification sbn = entry.notification;
		try {
		entry.cacheContentViews(mContext, null);
		} catch (RuntimeException e) {
		Log.e(TAG, "Unable to get notification remote views", e);
		return false;
		}

		final RemoteViews contentView = entry.cachedContentView;
		final RemoteViews bigContentView = entry.cachedBigContentView;
		@@ -2354,7 +2358,13 @@ public abstract class BaseStatusBar extends SystemUI implements
		Notification n = notification.getNotification();
		mNotificationData.updateRanking(ranking);

		boolean applyInPlace = entry.cacheContentViews(mContext, notification.getNotification());
		boolean applyInPlace;
		try {
		applyInPlace = entry.cacheContentViews(mContext, notification.getNotification());
		} catch (RuntimeException e) {
		Log.e(TAG, "Unable to get notification remote views", e);
		applyInPlace = false;
		}
		boolean shouldPeek = shouldPeek(entry, notification);
		boolean alertAgain = alertAgain(entry, n);
		if (DEBUG) {
		@@ -2406,7 +2416,10 @@ public abstract class BaseStatusBar extends SystemUI implements
		StatusBarIconView.contentDescForNotification(mContext, n));
		entry.icon.setNotification(n);
		entry.icon.set(ic);
		inflateViews(entry, mStackScroller);
		if (!inflateViews(entry, mStackScroller)) {
		handleNotificationError(notification, "Couldn't update remote views for: "
		+ notification);
		}
		}
		updateHeadsUp(key, entry, shouldPeek, alertAgain);
		updateNotifications();