Merge "Avoid race of checking screen states and sleep token" into main (aa5dd681) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −26

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		volatile boolean mRequestedOrSleepingDefaultDisplay;

		/**
		* This is used to check whether to invoke {@link #updateScreenOffSleepToken} when screen is
		* This is used to check whether to acquire screen-off sleep token when screen is
		* turned off. E.g. if it is false when screen is turned off and the display is swapping, it
		* is expected that the screen will be on in a short time. Then it is unnecessary to acquire
		* screen-off-sleep-token, so it can avoid intermediate visibility or lifecycle changes.
		@@ -610,7 +610,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private boolean mPendingKeyguardOccluded;
		private boolean mKeyguardOccludedChanged;

		private ActivityTaskManagerInternal.SleepTokenAcquirer mScreenOffSleepTokenAcquirer;
		Intent mHomeIntent;
		Intent mCarDockIntent;
		Intent mDeskDockIntent;
		@@ -2220,9 +2219,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mLockPatternUtils = new LockPatternUtils(mContext);
		mLogger = new MetricsLogger();

		mScreenOffSleepTokenAcquirer = mActivityTaskManagerInternal
		.createSleepTokenAcquirer("ScreenOff");

		Resources res = mContext.getResources();
		mWakeOnDpadKeyPress =
		res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress);
		@@ -5521,13 +5517,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mRequestedOrSleepingDefaultDisplay = true;
		mIsGoingToSleepDefaultDisplay = true;

		// In case startedGoingToSleep is called after screenTurnedOff (the source caller is in
		// order but the methods run on different threads) and updateScreenOffSleepToken was
		// skipped. Then acquire sleep token if screen was off.
		if (!mDefaultDisplayPolicy.isScreenOnFully() && !mDefaultDisplayPolicy.isScreenOnEarly()) {
		updateScreenOffSleepToken(true /* acquire */);
		}

		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.onStartedGoingToSleep(pmSleepReason);
		}
		@@ -5688,11 +5677,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (DEBUG_WAKEUP) Slog.i(TAG, "Display" + displayId + " turned off...");

		if (displayId == DEFAULT_DISPLAY) {
		if (!isSwappingDisplay \|\| mIsGoingToSleepDefaultDisplay) {
		updateScreenOffSleepToken(true /* acquire */);
		}
		final boolean acquireSleepToken = !isSwappingDisplay \|\| mIsGoingToSleepDefaultDisplay;
		mRequestedOrSleepingDefaultDisplay = false;
		mDefaultDisplayPolicy.screenTurnedOff();
		mDefaultDisplayPolicy.screenTurnedOff(acquireSleepToken);
		synchronized (mLock) {
		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.onScreenTurnedOff();
		@@ -5748,7 +5735,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (displayId == DEFAULT_DISPLAY) {
		Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "screenTurningOn",
		0 /* cookie */);
		updateScreenOffSleepToken(false /* acquire */);
		mDefaultDisplayPolicy.screenTurningOn(screenOnListener);
		mBootAnimationDismissable = false;

		@@ -6255,15 +6241,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		// TODO (multidisplay): Support multiple displays in WindowManagerPolicy.
		private void updateScreenOffSleepToken(boolean acquire) {
		if (acquire) {
		mScreenOffSleepTokenAcquirer.acquire(DEFAULT_DISPLAY);
		} else {
		mScreenOffSleepTokenAcquirer.release(DEFAULT_DISPLAY);
		}
		}

		/** {@inheritDoc} */
		@Override
		public void enableScreenAfterBoot() {

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

+0 −29

Original line number	Diff line number	Diff line
		@@ -129,35 +129,6 @@ public abstract class ActivityTaskManagerInternal {
		void onKeyguardStateChanged(boolean isShowing);
		}

		/**
		* Sleep tokens cause the activity manager to put the top activity to sleep.
		* They are used by components such as dreams that may hide and block interaction
		* with underlying activities.
		* The Acquirer provides an interface that encapsulates the underlying work, so the user does
		* not need to handle the token by him/herself.
		*/
		public interface SleepTokenAcquirer {

		/**
		* Acquires a sleep token.
		* @param displayId The display to apply to.
		*/
		void acquire(int displayId);

		/**
		* Releases the sleep token.
		* @param displayId The display to apply to.
		*/
		void release(int displayId);
		}

		/**
		* Creates a sleep token acquirer for the specified display with the specified tag.
		*
		* @param tag A string identifying the purpose (eg. "Dream").
		*/
		public abstract SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag);

		/**
		* Returns home activity for the specified user.
		*

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

+5 −11

Original line number	Diff line number	Diff line
		@@ -4356,6 +4356,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		mTaskOrganizerController.dump(pw, " ");
		mVisibleActivityProcessTracker.dump(pw, " ");
		mActiveUids.dump(pw, " ");
		pw.println(" SleepTokens=" + mRootWindowContainer.mSleepTokens);
		if (mDemoteTopAppReasons != 0) {
		pw.println(" mDemoteTopAppReasons=" + mDemoteTopAppReasons);
		}
		@@ -5071,17 +5072,16 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		EventLogTags.writeWmSetResumedActivity(r.mUserId, r.shortComponentName, reason);
		}

		final class SleepTokenAcquirerImpl implements ActivityTaskManagerInternal.SleepTokenAcquirer {
		final class SleepTokenAcquirer {
		private final String mTag;
		private final SparseArray<RootWindowContainer.SleepToken> mSleepTokens =
		new SparseArray<>();

		SleepTokenAcquirerImpl(@NonNull String tag) {
		SleepTokenAcquirer(@NonNull String tag) {
		mTag = tag;
		}

		@Override
		public void acquire(int displayId) {
		void acquire(int displayId) {
		synchronized (mGlobalLock) {
		if (!mSleepTokens.contains(displayId)) {
		mSleepTokens.append(displayId,
		@@ -5091,8 +5091,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}
		}

		@Override
		public void release(int displayId) {
		void release(int displayId) {
		synchronized (mGlobalLock) {
		final RootWindowContainer.SleepToken token = mSleepTokens.get(displayId);
		if (token != null) {
		@@ -5955,11 +5954,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}

		final class LocalService extends ActivityTaskManagerInternal {
		@Override
		public SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag) {
		Objects.requireNonNull(tag);
		return new SleepTokenAcquirerImpl(tag);
		}

		@Override
		public ComponentName getHomeActivityForUser(int userId) {

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -735,8 +735,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		/** All tokens used to put activities on this root task to sleep (including mOffToken) */
		final ArrayList<RootWindowContainer.SleepToken> mAllSleepTokens = new ArrayList<>();
		/** The token acquirer to put root tasks on the display to sleep */
		private final ActivityTaskManagerInternal.SleepTokenAcquirer mOffTokenAcquirer;

		private boolean mSleeping;

		@@ -1131,7 +1129,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		mDisplay = display;
		mDisplayId = display.getDisplayId();
		mCurrentUniqueDisplayId = display.getUniqueId();
		mOffTokenAcquirer = mRootWindowContainer.mDisplayOffTokenAcquirer;
		mWallpaperController = new WallpaperController(mWmService, this);
		mWallpaperController.resetLargestDisplay(display);
		display.getDisplayInfo(mDisplayInfo);
		@@ -6157,9 +6154,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		final int displayState = mDisplayInfo.state;
		if (displayId != DEFAULT_DISPLAY) {
		if (displayState == Display.STATE_OFF) {
		mOffTokenAcquirer.acquire(mDisplayId);
		mRootWindowContainer.mDisplayOffTokenAcquirer.acquire(mDisplayId);
		} else if (displayState == Display.STATE_ON) {
		mOffTokenAcquirer.release(mDisplayId);
		mRootWindowContainer.mDisplayOffTokenAcquirer.release(mDisplayId);
		}
		ProtoLog.v(WM_DEBUG_CONTENT_RECORDING,
		"Content Recording: Display %d state was (%d), is now (%d), so update "

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -804,6 +804,14 @@ public class DisplayPolicy {
		mAwake /* waiting */);
		if (!awake) {
		onDisplaySwitchFinished();
		// In case PhoneWindowManager's startedGoingToSleep is called after screenTurnedOff
		// (the source caller is in order but the methods run on different threads) and
		// updateScreenOffSleepToken was skipped by mIsGoingToSleepDefaultDisplay. Then
		// acquire sleep token if screen is off.
		if (!mScreenOnEarly && !mScreenOnFully && !mDisplayContent.isSleeping()) {
		Slog.w(TAG, "Late acquire sleep token for " + mDisplayContent);
		mService.mRoot.mDisplayOffTokenAcquirer.acquire(mDisplayContent.mDisplayId);
		}
		}
		}
		}
		@@ -851,6 +859,7 @@ public class DisplayPolicy {
		public void screenTurningOn(ScreenOnListener screenOnListener) {
		WindowProcessController visibleDozeUiProcess = null;
		synchronized (mLock) {
		mService.mRoot.mDisplayOffTokenAcquirer.release(mDisplayContent.mDisplayId);
		mScreenOnEarly = true;
		mScreenOnFully = false;
		mKeyguardDrawComplete = false;
		@@ -875,8 +884,12 @@ public class DisplayPolicy {
		onDisplaySwitchFinished();
		}

		public void screenTurnedOff() {
		/** It is called after {@link #screenTurningOn}. This runs on PowerManager's thread. */
		public void screenTurnedOff(boolean acquireSleepToken) {
		synchronized (mLock) {
		if (acquireSleepToken) {
		mService.mRoot.mDisplayOffTokenAcquirer.acquire(mDisplayContent.mDisplayId);
		}
		mScreenOnEarly = false;
		mScreenOnFully = false;
		mKeyguardDrawComplete = false;