Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[BUG] fix NullPointerException in Notification.java"

Browse Source 
am: c14d5db093

Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
This commit is contained in:
liangweikang
2017-03-17 14:51:58 +00:00
committed by android-build-merger
parent a34d01d1ee c14d5db093
commit 79e9f380e2
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/Notification.java
View File

@@ -1761,7 +1761,9 @@ public class Notification implements Parcelable
if (this.actions != null) { if (this.actions != null) {
that.actions = new Action[this.actions.length]; that.actions = new Action[this.actions.length];
for(int i=0; i<this.actions.length; i++) { 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. * @param action The action to add.
*/ */
public Builder addAction(Action action) { public Builder addAction(Action action) {
mActions.add(action); if (action != null) {
mActions.add(action);
}
return this; return this;
} }
@@ -3122,7 +3126,9 @@ public class Notification implements Parcelable
public Builder setActions(Action... actions) { public Builder setActions(Action... actions) {
mActions.clear(); mActions.clear();
for (int i = 0; i < actions.length; i++) { for (int i = 0; i < actions.length; i++) {
mActions.add(actions[i]); if (actions[i] != null) {
mActions.add(actions[i]);
}
} }
return this; return this;
} }