commit bc6d96e4d09ec71a2844ea4e9281b7e849a00f80
author Amith Yamasani <yamasani@google.com> Mon Apr 25 19:07:30 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 25 19:07:32 2016 +0000
tree b9317a8cfbb2c68d8e312049022851ccccc70a03
parent 904a39ca92f7e616d400a8733b3970b8828da072
parent 6e267d3d2367dc5fafb61f32a0abe4e5eb876358

Merge "Fix NPE when assist data request times out" into nyc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1e74f81..9d7ddc7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11983,8 +11983,12 @@
         }
         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) {
             }
         }