Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7efb7abe authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

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

am: 61e2f9fe

* commit '61e2f9fe':
  Fix NPE when assist data request times out

Change-Id: Ib0f2703061619bcf7cd16389abf5e64a62b0e626
parents d30451d0 61e2f9fe

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

+5 −1
Original line number Diff line number Diff line
@@ -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) {

            }

        }