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

Commit bc6d96e4 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 904a39ca 6e267d3d
Loading
Loading
Loading
Loading
+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) {
            }
        }