am 9454e298: am 98fd6405: Merge "Fix NPEs when using the APIs a little oddly." into jb-dev (667ca821) · Commits · e / os / android_frameworks_base

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) {