diff options
| author | Gus Prevas <kprevas@google.com> | 2015-03-25 12:55:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-25 12:55:37 +0000 |
| commit | 568356ff9a1deab794d329f8c2e245f5a564a2f3 (patch) | |
| tree | 78d742a95e62a947bf465e4a02292a86639da499 | |
| parent | c263a07a55a9806147304a1420ceec2d27a6b49d (diff) | |
| parent | 3e7bebf35c0080148f29ed518670bcd56e88b746 (diff) | |
| download | frameworks_base-568356ff9a1deab794d329f8c2e245f5a564a2f3.zip frameworks_base-568356ff9a1deab794d329f8c2e245f5a564a2f3.tar.gz frameworks_base-568356ff9a1deab794d329f8c2e245f5a564a2f3.tar.bz2 | |
Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
| -rw-r--r-- | core/java/android/app/ActivityView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java index fecaf6f..a7864f4 100644 --- a/core/java/android/app/ActivityView.java +++ b/core/java/android/app/ActivityView.java @@ -350,10 +350,15 @@ public class ActivityView extends ViewGroup { if (activityView != null) { final ActivityViewCallback callback = activityView.mActivityViewCallback; if (callback != null) { + final WeakReference<ActivityViewCallback> callbackRef = + new WeakReference<>(callback); activityView.post(new Runnable() { @Override public void run() { - callback.onAllActivitiesComplete(activityView); + ActivityViewCallback callback = callbackRef.get(); + if (callback != null) { + callback.onAllActivitiesComplete(activityView); + } } }); } |