Merge "AML: Support concurrent launches" (75430a2f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+417 −392

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/ActivityRecord.java

+7 −13

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ import com.android.server.display.color.ColorDisplayService;
		import com.android.server.policy.WindowManagerPolicy;
		import com.android.server.protolog.common.ProtoLog;
		import com.android.server.uri.UriPermissionOwner;
		import com.android.server.wm.ActivityMetricsLogger.WindowingModeTransitionInfoSnapshot;
		import com.android.server.wm.ActivityMetricsLogger.TransitionInfoSnapshot;
		import com.android.server.wm.ActivityStack.ActivityState;
		import com.android.server.wm.WindowManagerService.H;
		import com.android.server.wm.utils.InsetUtils;
		@@ -3010,6 +3010,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		getDisplayContent().mChangingApps.remove(this);
		getDisplayContent().mUnknownAppVisibilityController.appRemovedOrHidden(this);
		mWmService.mTaskSnapshotController.onAppRemoved(this);
		mStackSupervisor.getActivityMetricsLogger().notifyActivityRemoved(this);
		waitingToShow = false;
		if (getDisplayContent().mClosingApps.contains(this)) {
		delayed = true;
		@@ -4985,7 +4986,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		void reportFullyDrawnLocked(boolean restoredFromBundle) {
		final WindowingModeTransitionInfoSnapshot info = mStackSupervisor
		final TransitionInfoSnapshot info = mStackSupervisor
		.getActivityMetricsLogger().logAppTransitionReportedDrawn(this, restoredFromBundle);
		if (info != null) {
		mStackSupervisor.reportActivityLaunchedLocked(false /* timeout */, this,
		@@ -5017,8 +5018,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (!drawn) {
		return;
		}
		final WindowingModeTransitionInfoSnapshot info = mStackSupervisor
		.getActivityMetricsLogger().notifyWindowsDrawn(getWindowingMode(), timestampNs);
		final TransitionInfoSnapshot info = mStackSupervisor
		.getActivityMetricsLogger().notifyWindowsDrawn(this, timestampNs);
		final int windowsDrawnDelayMs = info != null ? info.windowsDrawnDelayMs : INVALID_DELAY;
		final @LaunchState int launchState = info != null ? info.getLaunchState() : -1;
		mStackSupervisor.reportActivityLaunchedLocked(false /* timeout */, this,
		@@ -5219,7 +5220,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		}
		} else if (w.isDrawnLw()) {
		onStartingWindowDrawn(SystemClock.elapsedRealtimeNanos());
		// The starting window for this container is drawn.
		mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn(this);
		startingDisplayed = true;
		}
		}
		@@ -5227,14 +5229,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return isInterestingAndDrawn;
		}

		/** Called when the starting window for this container is drawn. */
		private void onStartingWindowDrawn(long timestampNs) {
		synchronized (mAtmService.mGlobalLock) {
		mAtmService.mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn(
		getWindowingMode(), timestampNs);
		}
		}

		/**
		* Called when the key dispatching to a window associated with the app window container
		* timed-out.

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ import com.android.internal.util.function.pooled.PooledConsumer;
		import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.server.am.ActivityManagerService;
		import com.android.server.am.UserState;
		import com.android.server.wm.ActivityMetricsLogger.LaunchingState;

		import java.io.FileDescriptor;
		import java.io.IOException;
		@@ -443,8 +444,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		mInitialized = true;
		setRunningTasks(new RunningTasks());

		mActivityMetricsLogger = new ActivityMetricsLogger(this, mService.mContext,
		mHandler.getLooper());
		mActivityMetricsLogger = new ActivityMetricsLogger(this, mHandler.getLooper());
		mKeyguardController = new KeyguardController(mService, this);

		mPersisterQueue = new PersisterQueue();
		@@ -576,8 +576,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		}

		void stopWaitingForActivityVisible(ActivityRecord r) {
		stopWaitingForActivityVisible(r,
		getActivityMetricsLogger().getLastDrawnDelayMs(r.getWindowingMode()));
		stopWaitingForActivityVisible(r, getActivityMetricsLogger().getLastDrawnDelayMs(r));
		}

		void stopWaitingForActivityVisible(ActivityRecord r, long totalTime) {
		@@ -2762,6 +2761,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {

		mRootActivityContainer.sendPowerHintForLaunchStartIfNeeded(
		true /* forceSend */, targetActivity);
		final LaunchingState launchingState =
		mActivityMetricsLogger.notifyActivityLaunching(task.intent);
		try {
		mService.moveTaskToFrontLocked(null /* appThread /, null / callingPackage */,
		@@ -2770,8 +2770,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		// the override pending app transition will be applied immediately.
		targetActivity.applyOptionsLocked();
		} finally {
		mActivityMetricsLogger.notifyActivityLaunched(START_TASK_TO_FRONT,
		targetActivity);
		mActivityMetricsLogger.notifyActivityLaunched(launchingState,
		START_TASK_TO_FRONT, targetActivity);
		}

		mService.getActivityStartController().postStartActivityProcessingForLastStarter(

services/core/java/com/android/server/wm/ActivityStarter.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ import com.android.internal.app.HeavyWeightSwitcherActivity;
		import com.android.internal.app.IVoiceInteractor;
		import com.android.server.am.PendingIntentRecord;
		import com.android.server.pm.InstantAppResolver;
		import com.android.server.wm.ActivityMetricsLogger.LaunchingState;
		import com.android.server.wm.ActivityStackSupervisor.PendingActivityLaunch;
		import com.android.server.wm.LaunchParamsController.LaunchParams;

		@@ -572,15 +573,16 @@ class ActivityStarter {
		IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,
		int startFlags, boolean doResume, ActivityOptions options, Task inTask) {
		try {
		mSupervisor.getActivityMetricsLogger().notifyActivityLaunching(r.intent);
		final LaunchingState launchingState = mSupervisor.getActivityMetricsLogger()
		.notifyActivityLaunching(r.intent, r.resultTo);
		mLastStartReason = "startResolvedActivity";
		mLastStartActivityTimeMs = System.currentTimeMillis();
		mLastStartActivityRecord = r;
		mLastStartActivityResult = startActivityUnchecked(r, sourceRecord, voiceSession,
		voiceInteractor, startFlags, doResume, options, inTask,
		false /* restrictedBgActivity */);
		mSupervisor.getActivityMetricsLogger().notifyActivityLaunched(mLastStartActivityResult,
		mLastStartActivityRecord);
		mSupervisor.getActivityMetricsLogger().notifyActivityLaunched(launchingState,
		mLastStartActivityResult, mLastStartActivityRecord);
		} finally {
		onExecutionComplete();
		}
		@@ -598,8 +600,14 @@ class ActivityStarter {
		throw new IllegalArgumentException("File descriptors passed in Intent");
		}

		mSupervisor.getActivityMetricsLogger().notifyActivityLaunching(mRequest.intent);
		final LaunchingState launchingState;
		synchronized (mService.mGlobalLock) {
		final ActivityRecord caller = ActivityRecord.forTokenLocked(mRequest.resultTo);
		launchingState = mSupervisor.getActivityMetricsLogger().notifyActivityLaunching(
		mRequest.intent, caller);
		}

		// Do not lock the resolving to avoid potential deadlock.
		if (mRequest.activityInfo == null) {
		mRequest.resolveActivity(mSupervisor);
		}
		@@ -643,7 +651,7 @@ class ActivityStarter {
		// Notify ActivityMetricsLogger that the activity has launched.
		// ActivityMetricsLogger will then wait for the windows to be drawn and populate
		// WaitResult.
		mSupervisor.getActivityMetricsLogger().notifyActivityLaunched(res,
		mSupervisor.getActivityMetricsLogger().notifyActivityLaunched(launchingState, res,
		mLastStartActivityRecord);
		return getExternalResult(mRequest.waitResult == null ? res
		: waitForResult(res, mLastStartActivityRecord));

services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -32,9 +32,7 @@ import android.content.res.CompatibilityInfo;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.service.voice.IVoiceInteractionSession;
		import android.util.SparseIntArray;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.app.IVoiceInteractor;
		@@ -153,17 +151,6 @@ public abstract class ActivityTaskManagerInternal {
		IVoiceInteractionSession mSession,
		IVoiceInteractor mInteractor);

		/**
		* Callback for window manager to let activity manager know that we are finally starting the
		* app transition;
		*
		* @param reasons A map from windowing mode to a reason integer why the transition was started,
		* which must be one of the APP_TRANSITION_* values.
		* @param timestampNs The time at which the app transition started in
		* {@link SystemClock#elapsedRealtimeNs()} ()} timebase.
		*/
		public abstract void notifyAppTransitionStarting(SparseIntArray reasons, long timestampNs);

		/**
		* Callback for window manager to let activity manager know that the app transition was
		* cancelled.