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

1 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 8220fd9..ceb8cde 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1367,7 +1367,9 @@ public class Notification implements Parcelable
         public Builder setStyle(Style style) {
             if (mStyle != style) {
                 mStyle = style;
-                mStyle.setBuilder(this);
+                if (mStyle != null) {
+                    mStyle.setBuilder(this);
+                }
             }
             return this;
         }
@@ -1637,7 +1639,9 @@ public class Notification implements Parcelable
         public void setBuilder(Builder builder) {
             if (mBuilder != builder) {
                 mBuilder = builder;
-                mBuilder.setStyle(this);
+                if (mBuilder != null) {
+                    mBuilder.setStyle(this);
+                }
             }
         }