Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 (9b0784aa) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -1761,9 +1761,11 @@ public class Notification implements Parcelable
		if (this.actions != null) {
		that.actions = new Action[this.actions.length];
		for(int i=0; i<this.actions.length; i++) {
		if ( this.actions[i] != null) {
		that.actions[i] = this.actions[i].clone();
		}
		}
		}

		if (heavy && this.bigContentView != null) {
		that.bigContentView = this.bigContentView.clone();
		@@ -3108,7 +3110,9 @@ public class Notification implements Parcelable
		* @param action The action to add.
		*/
		public Builder addAction(Action action) {
		if (action != null) {
		mActions.add(action);
		}
		return this;
		}

		@@ -3122,8 +3126,10 @@ public class Notification implements Parcelable
		public Builder setActions(Action... actions) {
		mActions.clear();
		for (int i = 0; i < actions.length; i++) {
		if (actions[i] != null) {
		mActions.add(actions[i]);
		}
		}
		return this;
		}