From 53c934cb75613b4413172bfec9fe95776af62941 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 16 Sep 2016 14:03:43 -0400
Subject: [PATCH] Null check action cloning.

Bug: 31275706
Change-Id: I7f8c14a5863d2f787b9090ef740e80ce0c4b9335
---
 core/java/android/app/Notification.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 29ed97e78dcb2..981a0551fc7e2 100644
--- 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());
         }