Merge "Don't put a null in a spannablestringbuilder" (a0912135) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/notification/history/NotificationStation.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
		if (n.extras != null) {
		title = n.extras.getCharSequence(Notification.EXTRA_TITLE);
		}
		return title == null? null : String.valueOf(title);
		return title == null? "" : String.valueOf(title);
		}

		/**
		@@ -339,7 +339,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
		text = n.extras.getCharSequence(Notification.EXTRA_TEXT);
		}
		}
		return text == null ? null : String.valueOf(text);
		return text == null ? "" : String.valueOf(text);
		}

		private Drawable loadIcon(HistoricalNotificationInfo info, StatusBarNotification sbn) {