Merge \"Fixed a bug with a legacy notification API\" into nyc-dev (1eb9ae92) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1986,6 +1986,10 @@ public class Notification implements Parcelable
		new Throwable());
		}

		if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.N) {
		extras.putBoolean(EXTRA_SHOW_WHEN, true);
		}

		// ensure that any information already set directly is preserved
		final Notification.Builder builder = new Notification.Builder(context, this);

		@@ -2269,6 +2273,14 @@ public class Notification implements Parcelable
		Collections.addAll(mPersonList, mN.extras.getStringArray(EXTRA_PEOPLE));
		}

		if (mN.getSmallIcon() == null && mN.icon != 0) {
		setSmallIcon(mN.icon);
		}

		if (mN.getLargeIcon() == null && mN.largeIcon != null) {
		setLargeIcon(mN.largeIcon);
		}

		String templateClass = mN.extras.getString(EXTRA_TEMPLATE);
		if (!TextUtils.isEmpty(templateClass)) {
		final Class<? extends Style> styleClass