Don't rely on intent to call back from activity tracker
- The intent is not updated in certain cases which means that the
callback may not be made if Launcher gets recreated. Instead
have the tracker manage the set of registered callbacks.
- This change allows AbsSwipeUpHandler to continue to receive
onActivityInit calls even if Launcher restarts, and also to
handle a case where restarting while waiting for a page-settling
callback will continue to finish the gesture.
Bug: 183962705
Test: Force recreate at various points in the gesture
Change-Id: Ib5ead8c868e798e26e56776f57bd715c79d087cd
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 578379b..c91fb27 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1472,7 +1472,7 @@
boolean shouldMoveToDefaultScreen = alreadyOnHome && isInState(NORMAL)
&& AbstractFloatingView.getTopOpenView(this) == null;
boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
- boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this, intent);
+ boolean internalStateHandled = ACTIVITY_TRACKER.handleNewIntent(this);
hideKeyboard();
if (isActionMain) {
if (!internalStateHandled) {
diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java
index b4288ce..2844fb2 100644
--- a/src/com/android/launcher3/dragndrop/AddItemActivity.java
+++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java
@@ -213,7 +213,7 @@
.addCategory(Intent.CATEGORY_HOME)
.setPackage(getPackageName())
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Launcher.ACTIVITY_TRACKER.runCallbackWhenActivityExists(listener, homeIntent);
+ Launcher.ACTIVITY_TRACKER.registerCallback(listener);
startActivity(homeIntent,
ActivityOptions.makeCustomAnimation(this, 0, android.R.anim.fade_out)
.toBundle());
diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 5832711..87871b1 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -25,6 +25,7 @@
import com.android.launcher3.BaseActivity;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Utilities;
+import com.android.launcher3.util.ActivityTracker;
import com.android.launcher3.util.UiThreadHelper;
/**
@@ -50,7 +51,7 @@
/**
* Rotation request made by
- * {@link com.android.launcher3.util.ActivityTracker.SchedulerCallback}.
+ * {@link ActivityTracker.SchedulerCallback}.
* This supersedes any other request.
*/
private int mStateHandlerRequest = REQUEST_NONE;
diff --git a/src/com/android/launcher3/util/ActivityTracker.java b/src/com/android/launcher3/util/ActivityTracker.java
index b5b9c2f..7af1a13 100644
--- a/src/com/android/launcher3/util/ActivityTracker.java
+++ b/src/com/android/launcher3/util/ActivityTracker.java
@@ -15,15 +15,14 @@
*/
package com.android.launcher3.util;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-
import androidx.annotation.Nullable;
import com.android.launcher3.BaseActivity;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Helper class to statically track activity creation
@@ -32,8 +31,7 @@
public final class ActivityTracker<T extends BaseActivity> {
private WeakReference<T> mCurrentActivity = new WeakReference<>(null);
-
- private static final String EXTRA_SCHEDULER_CALLBACK = "launcher.scheduler_callback";
+ private CopyOnWriteArrayList<SchedulerCallback<T>> mCallbacks = new CopyOnWriteArrayList<>();
@Nullable
public <R extends T> R getCreatedActivity() {
@@ -47,43 +45,50 @@
}
/**
- * Call {@link SchedulerCallback#init(BaseActivity, boolean)} when the activity is ready.
- * If the activity is already created, this is called immediately, otherwise we add the
- * callback as an extra on the intent, and will call init() when we get handleIntent().
+ * Call {@link SchedulerCallback#init(BaseActivity, boolean)} when the
+ * activity is ready. If the activity is already created, this is called immediately.
+ *
+ * The tracker maintains a strong ref to the callback, so it is up to the caller to return
+ * {@code false} in the callback OR to unregister the callback explicitly.
+ *
* @param callback The callback to call init() on when the activity is ready.
- * @param intent The intent that will be used to initialize the activity, if the activity
- * doesn't already exist. We add the callback as an extra on this intent.
*/
- public void runCallbackWhenActivityExists(SchedulerCallback<T> callback, Intent intent) {
+ public void registerCallback(SchedulerCallback<T> callback) {
T activity = mCurrentActivity.get();
+ mCallbacks.add(callback);
if (activity != null) {
- callback.init(activity, activity.isStarted());
- } else {
- callback.addToIntent(intent);
+ if (!callback.init(activity, activity.isStarted())) {
+ unregisterCallback(callback);
+ }
}
}
+ /**
+ * Unregisters a registered callback.
+ */
+ public void unregisterCallback(SchedulerCallback<T> callback) {
+ mCallbacks.remove(callback);
+ }
+
public boolean handleCreate(T activity) {
mCurrentActivity = new WeakReference<>(activity);
- return handleIntent(activity, activity.getIntent(), false);
+ return handleIntent(activity, false /* alreadyOnHome */);
}
- public boolean handleNewIntent(T activity, Intent intent) {
- return handleIntent(activity, intent, activity.isStarted());
+ public boolean handleNewIntent(T activity) {
+ return handleIntent(activity, activity.isStarted());
}
- private boolean handleIntent(T activity, Intent intent, boolean alreadyOnHome) {
- if (intent != null && intent.getExtras() != null) {
- IBinder stateBinder = intent.getExtras().getBinder(EXTRA_SCHEDULER_CALLBACK);
- SchedulerCallback<T> handler = ObjectWrapper.unwrap(stateBinder);
- if (handler != null) {
- if (!handler.init(activity, alreadyOnHome)) {
- intent.getExtras().remove(EXTRA_SCHEDULER_CALLBACK);
- }
- return true;
+ private boolean handleIntent(T activity, boolean alreadyOnHome) {
+ boolean handled = false;
+ for (SchedulerCallback<T> cb : mCallbacks) {
+ if (!cb.init(activity, alreadyOnHome)) {
+ // Callback doesn't want any more updates
+ unregisterCallback(cb);
}
+ handled = true;
}
- return false;
+ return handled;
}
public interface SchedulerCallback<T extends BaseActivity> {
@@ -94,17 +99,5 @@
* @return Whether to continue receiving callbacks (i.e. if the activity is recreated).
*/
boolean init(T activity, boolean alreadyOnHome);
-
- /**
- * Adds this callback as an extra on the intent, so we can retrieve it in handleIntent() and
- * call {@link #init}. The intent should be used to start the activity after calling this
- * method in order for us to get handleIntent().
- */
- default Intent addToIntent(Intent intent) {
- Bundle extras = new Bundle();
- extras.putBinder(EXTRA_SCHEDULER_CALLBACK, ObjectWrapper.wrap(this));
- intent.putExtras(extras);
- return intent;
- }
}
}