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

Commit c08dea2a authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Fix NPEs when using the APIs a little oddly. 

This should help developers use some of the features of
Style via subclassing rather than duplicating functionality.

Bug: 6716608
Change-Id: I048e8221c8046e9779e08e6e262ac3fb37b01cb3
parent 4708d8f5

core/java/android/app/Notification.java

+6 −2
Original line number Diff line number Diff line
@@ -1367,8 +1367,10 @@ public class Notification implements Parcelable 
        public Builder setStyle(Style style) {

            if (mStyle != style) {

                mStyle = style;

                if (mStyle != null) {

                    mStyle.setBuilder(this);

                }

            }

            return this;

        }
@@ -1637,9 +1639,11 @@ public class Notification implements Parcelable 
        public void setBuilder(Builder builder) {

            if (mBuilder != builder) {

                mBuilder = builder;

                if (mBuilder != null) {

                    mBuilder.setStyle(this);

                }

            }

        }



        protected void checkBuilder() {

            if (mBuilder == null) {