commit 5a2c5a3bd99318b72a2d1ffebc86ba391b99b400
author liangweikang <liangweikang900911@gmail.com> Fri Mar 17 15:07:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 15:07:50 2017 +0000
tree cec2887de9ff95164d8e4bee6483f8119c1aebc4
parent 1d33b07f44764827ee10bf3eeed279de8d4d9e4a
parent 9b0784aa5f57a2107ebfcd8f507ce291aac8dde3

Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 am: 79e9f380e2
am: 9b0784aa5f

Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index a098591..870c412 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1935,7 +1935,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();
+                }
             }
         }
 
@@ -3432,7 +3434,9 @@
          * @param action The action to add.
          */
         public Builder addAction(Action action) {
-            mActions.add(action);
+            if (action != null) {
+                mActions.add(action);
+            }
             return this;
         }
 
@@ -3446,7 +3450,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;
         }