Merge "Fix NPEs when using the APIs a little oddly." into jb-dev

Author: Mike Cleron

core/java/android/app/Notification.java

@@ -1367,7 +1367,9 @@ public Builder addAction(int icon, CharSequence title, PendingIntent intent) {
         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 @@ protected void internalSetSummaryText(CharSequence cs) {
         public void setBuilder(Builder builder) {
             if (mBuilder != builder) {
                 mBuilder = builder;
-                mBuilder.setStyle(this);
+                if (mBuilder != null) {
+                    mBuilder.setStyle(this);
+                }
             }
         }