diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 0dd9c63c40c5..bcdf3f492516 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1761,7 +1761,9 @@ 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++) { - that.actions[i] = this.actions[i].clone(); + if ( this.actions[i] != null) { + that.actions[i] = this.actions[i].clone(); + } } } @@ -3108,7 +3110,9 @@ public class Notification implements Parcelable * @param action The action to add. */ public Builder addAction(Action action) { - mActions.add(action); + if (action != null) { + mActions.add(action); + } return this; } @@ -3122,7 +3126,9 @@ public class Notification implements Parcelable public Builder setActions(Action... actions) { mActions.clear(); for (int i = 0; i < actions.length; i++) { - mActions.add(actions[i]); + if (actions[i] != null) { + mActions.add(actions[i]); + } } return this; } |