Merge "Schedule local activity relaunch" into pi-dev am: 1ed9f4294c (591eb66d) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5578,7 +5578,7 @@ public class Activity extends ContextThemeWrapper
		if (mParent != null) {
		throw new IllegalStateException("Can only be called on top-level activity");
		}
		mMainThread.handleRelaunchActivityLocally(mToken);
		mMainThread.scheduleRelaunchActivity(mToken);
		}

		/**

core/java/android/app/ActivityThread.java

+21 −8

Original line number	Diff line number	Diff line
		@@ -1555,6 +1555,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		public static final int APPLICATION_INFO_CHANGED = 156;
		public static final int RUN_ISOLATED_ENTRY_POINT = 158;
		public static final int EXECUTE_TRANSACTION = 159;
		public static final int RELAUNCH_ACTIVITY = 160;

		String codeToString(int code) {
		if (DEBUG_MESSAGES) {
		@@ -1598,6 +1599,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		case APPLICATION_INFO_CHANGED: return "APPLICATION_INFO_CHANGED";
		case RUN_ISOLATED_ENTRY_POINT: return "RUN_ISOLATED_ENTRY_POINT";
		case EXECUTE_TRANSACTION: return "EXECUTE_TRANSACTION";
		case RELAUNCH_ACTIVITY: return "RELAUNCH_ACTIVITY";
		}
		}
		return Integer.toString(code);
		@@ -1780,6 +1782,9 @@ public final class ActivityThread extends ClientTransactionHandler {
		}
		// TODO(lifecycler): Recycle locally scheduled transactions.
		break;
		case RELAUNCH_ACTIVITY:
		handleRelaunchActivityLocally((IBinder) msg.obj);
		break;
		}
		Object obj = msg.obj;
		if (obj instanceof SomeArgs) {
		@@ -4284,7 +4289,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
		final Activity activity = entry.getValue().activity;
		if (!activity.mFinished) {
		handleRelaunchActivityLocally(entry.getKey());
		scheduleRelaunchActivity(entry.getKey());
		}
		}
		}
		@@ -4662,21 +4667,29 @@ public final class ActivityThread extends ClientTransactionHandler {
		}
		}

		/** Performs the activity relaunch locally vs. requesting from system-server. */
		void handleRelaunchActivityLocally(IBinder token) {
		if (Looper.myLooper() != getLooper()) {
		throw new IllegalStateException("Must be called from main thread");
		/**
		* Post a message to relaunch the activity. We do this instead of launching it immediately,
		* because this will destroy the activity from which it was called and interfere with the
		* lifecycle changes it was going through before. We need to make sure that we have finished
		* handling current transaction item before relaunching the activity.
		*/
		void scheduleRelaunchActivity(IBinder token) {
		sendMessage(H.RELAUNCH_ACTIVITY, token);
		}

		/** Performs the activity relaunch locally vs. requesting from system-server. */
		private void handleRelaunchActivityLocally(IBinder token) {
		final ActivityClientRecord r = mActivities.get(token);
		if (r == null) {
		Log.w(TAG, "Activity to relaunch no longer exists");
		return;
		}

		final int prevState = r.getLifecycleState();

		if (prevState < ON_RESUME) {
		Log.w(TAG, "Activity needs to be already resumed in other to be relaunched.");
		if (prevState < ON_RESUME \|\| prevState > ON_STOP) {
		Log.w(TAG, "Activity state must be in [ON_RESUME..ON_STOP] in order to be relaunched,"
		+ "current state is " + prevState);
		return;
		}