commit 79e9f380e2e8d5748fbe2c6b9dda027856c589d7
author liangweikang <liangweikang900911@gmail.com> Fri Mar 17 14:51:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 14:51:58 2017 +0000
tree 2c08923279a98a65ca6af25328bf291e2f768019
parent a34d01d1ee457250ba7a8569b337e1f664fa584d
parent c14d5db0930fc296dddc212cf42de04eaa0d5b24

Merge "[BUG] fix NullPointerException in Notification.java"
am: c14d5db093

Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 0dd9c63..bcdf3f4 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1761,7 +1761,9 @@
         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 @@
          * @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 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;
         }