commit c4d7fc10211e9f08317c94e64ac57447e04af428
author Gus Prevas <kprevas@google.com> Wed Mar 25 13:02:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 25 13:02:46 2015 +0000
tree b55fc90cbf2b170dfc70c5d6ca9a2562ddd75250
parent 693236b367050f40b02ab22991d30eb260ec53ea
parent 568356ff9a1deab794d329f8c2e245f5a564a2f3

am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev

* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
  Changes callback to a WeakReference in ActivityContainerCallback.

core/java/android/app/ActivityView.java

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 @@
             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);
+                            }
                         }
                     });
                 }