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

Commit 6e267d3d authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix NPE when assist data request times out 

Bug: 28329835
Change-Id: I032e20ea1008512954b97519a4abb6fe4d65c673
parent d67a1ca4

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

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

            }

        }