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

Commit d3f36dfd authored by Johannes Carlsson's avatar Johannes Carlsson Committed by Android Git Automerger
Browse files

am 73fef3c7: am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak 

* commit '73fef3c7':
  Clear reference to the IIntentReceiver in order to avoid memory leak
parents d541f0cb 73fef3c7

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

+3 −0
Original line number Diff line number Diff line
@@ -11352,6 +11352,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.