Merge "Null check action cloning." into nyc-mr1-dev

2016-09-19 20:35:32 +00:00
parent 4b7c8d0c6b 53c934cb75
commit d0f20c2bbd
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1229,7 +1229,7 @@ public class Notification implements Parcelable
                    getIcon(),
                    title,
                    actionIntent, // safe to alias
-                    new Bundle(mExtras),
+                    mExtras == null ? new Bundle() : new Bundle(mExtras),
                    getRemoteInputs(),
                    getAllowGeneratedReplies());
        }