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

Commit 3769240b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Code Review
Browse files

Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"

parents 69ebb984 58975915

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

+3 −0
Original line number Diff line number Diff line
@@ -11035,6 +11035,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
                            performReceiveLocked(r.callerApp, r.resultTo,

                                new Intent(r.intent), r.resultCode,

                                r.resultData, r.resultExtras, false, false);

                            // Set this to null so that the reference

                            // (local and remote) isnt kept in the mBroadcastHistory.

                            r.resultTo = null;

                        } catch (RemoteException e) {

                            Slog.w(TAG, "Failure sending broadcast result of " + r.intent, e);

                        }

services/java/com/android/server/am/BroadcastRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class BroadcastRecord extends Binder { 
    final boolean initialSticky; // initial broadcast from register to sticky?

    final String requiredPermission; // a permission the caller has required

    final List receivers;   // contains BroadcastFilter and ResolveInfo

    final IIntentReceiver resultTo; // who receives final result if non-null

    IIntentReceiver resultTo; // who receives final result if non-null

    long dispatchTime;      // when dispatch started on this set of receivers

    long receiverTime;      // when current receiver started for timeouts.

    long finishTime;        // when we finished the broadcast.