Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2975ddfe authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev am: 05e19bba am: 844d178c 

am: bac9f445

Change-Id: I50ecfe4375d6c62792c4338203d6a70459841c56
parents 225cfc4c bac9f445

core/java/android/app/Notification.java

+12 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,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);
@@ -2271,6 +2275,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