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

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

Browse Source 
am: 9b0784aa5f

Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650
This commit is contained in:
liangweikang
2017-03-17 15:07:50 +00:00
committed by android-build-merger
parent 1d33b07f44 9b0784aa5f
commit 5a2c5a3bd9
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

@@ -1935,7 +1935,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();
}
}
}
@@ -3432,7 +3434,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;
}
@@ -3446,7 +3450,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;
}