diff options
| -rw-r--r-- | core/java/android/app/Notification.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 83a20668b3b4..5a448f03a118 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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 |