Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-05 19:10:15 -08:00
committed by Android Code Review
parent 69ebb984f2 5897591537
commit 3769240b79
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -11035,6 +11035,9 @@ public final class ActivityManagerService extends ActivityManagerNative
performReceiveLocked(r.callerApp, r.resultTo, performReceiveLocked(r.callerApp, r.resultTo,
new Intent(r.intent), r.resultCode, new Intent(r.intent), r.resultCode,
r.resultData, r.resultExtras, false, false); 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) { } catch (RemoteException e) {
Slog.w(TAG, "Failure sending broadcast result of " + r.intent, e); Slog.w(TAG, "Failure sending broadcast result of " + r.intent, e);
} }

2
services/java/com/android/server/am/BroadcastRecord.java
View File

@@ -45,7 +45,7 @@ class BroadcastRecord extends Binder {
final boolean initialSticky; // initial broadcast from register to sticky? final boolean initialSticky; // initial broadcast from register to sticky?
final String requiredPermission; // a permission the caller has required final String requiredPermission; // a permission the caller has required
final List receivers; // contains BroadcastFilter and ResolveInfo 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 dispatchTime; // when dispatch started on this set of receivers
long receiverTime; // when current receiver started for timeouts. long receiverTime; // when current receiver started for timeouts.
long finishTime; // when we finished the broadcast. long finishTime; // when we finished the broadcast.