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

2016-04-25 19:07:30 +00:00
parent 904a39ca92 6e267d3d23
commit bc6d96e4d0
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11983,8 +11983,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) {
            }
        }