From 6e267d3d2367dc5fafb61f32a0abe4e5eb876358 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 25 Apr 2016 10:24:52 -0700
Subject: [PATCH] Fix NPE when assist data request times out

Bug: 28329835
Change-Id: I032e20ea1008512954b97519a4abb6fe4d65c673
---
 .../java/com/android/server/am/ActivityManagerService.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 3b024cfef9776..b76adb80c69a4 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11979,8 +11979,12 @@ public final class ActivityManagerService extends ActivityManagerNative
         }
         if (receiver != null) {
             // Caller wants result sent back to them.
+            Bundle sendBundle = new Bundle();
+            // At least return the receiver extras
+            sendBundle.putBundle(VoiceInteractionSession.KEY_RECEIVER_EXTRAS,
+                    pae.receiverExtras);
             try {
-                pae.receiver.send(0, null);
+                pae.receiver.send(0, sendBundle);
             } catch (RemoteException e) {
             }
         }