Merge "Prevent sleep tokens from being created recursively." into rvc-qpr-dev am: 712847301b (4aadb5e4) · Commits · e / os / android_frameworks_base

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

+6 −10

Original line number	Diff line number	Diff line
		@@ -209,7 +209,6 @@ import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback;
		import com.android.server.statusbar.StatusBarManagerInternal;
		import com.android.server.vr.VrManagerInternal;
		import com.android.server.wm.ActivityTaskManagerInternal;
		import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
		import com.android.server.wm.AppTransition;
		import com.android.server.wm.DisplayPolicy;
		import com.android.server.wm.DisplayRotation;
		@@ -491,7 +490,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private boolean mPendingKeyguardOccluded;
		private boolean mKeyguardOccludedChanged;

		SleepToken mScreenOffSleepToken;
		private ActivityTaskManagerInternal.SleepTokenAcquirer mScreenOffSleepTokenAcquirer;
		volatile boolean mKeyguardOccluded;
		Intent mHomeIntent;
		Intent mCarDockIntent;
		@@ -1741,6 +1740,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId);
		mLogger = new MetricsLogger();

		mScreenOffSleepTokenAcquirer = mActivityTaskManagerInternal
		.createSleepTokenAcquirer("ScreenOff");

		Resources res = mContext.getResources();
		mWakeOnDpadKeyPress =
		res.getBoolean(com.android.internal.R.bool.config_wakeOnDpadKeyPress);
		@@ -4988,15 +4990,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// TODO (multidisplay): Support multiple displays in WindowManagerPolicy.
		private void updateScreenOffSleepToken(boolean acquire) {
		if (acquire) {
		if (mScreenOffSleepToken == null) {
		mScreenOffSleepToken = mActivityTaskManagerInternal.acquireSleepToken(
		"ScreenOff", DEFAULT_DISPLAY);
		}
		mScreenOffSleepTokenAcquirer.acquire(DEFAULT_DISPLAY);
		} else {
		if (mScreenOffSleepToken != null) {
		mScreenOffSleepToken.release();
		mScreenOffSleepToken = null;
		}
		mScreenOffSleepTokenAcquirer.release(DEFAULT_DISPLAY);
		}
		}

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -125,20 +125,30 @@ public abstract class ActivityTaskManagerInternal {
		* 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 static abstract class SleepToken {
		public interface SleepTokenAcquirer {

		/** Releases the sleep token. */
		public abstract void release();
		/**
		* 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);
		}

		/**
		* Acquires a sleep token for the specified display with the specified tag.
		* Creates a sleep token acquirer for the specified display with the specified tag.
		*
		* @param tag A string identifying the purpose of the token (eg. "Dream").
		* @param displayId The display to apply the sleep token to.
		* @param tag A string identifying the purpose (eg. "Dream").
		*/
		public abstract SleepToken acquireSleepToken(@NonNull String tag, int displayId);
		public abstract SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag);

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

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

+35 −9

Original line number	Diff line number	Diff line
		@@ -5087,7 +5087,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS);
		proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS,
		PowerManagerInternal.wakefulnessToProtoEnum(wakeFullness));
		for (ActivityTaskManagerInternal.SleepToken st : mRootWindowContainer.mSleepTokens) {
		final int tokenSize = mRootWindowContainer.mSleepTokens.size();
		for (int i = 0; i < tokenSize; i++) {
		final RootWindowContainer.SleepToken st =
		mRootWindowContainer.mSleepTokens.valueAt(i);
		proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEP_TOKENS,
		st.toString());
		}
		@@ -5521,12 +5524,35 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		reason);
		}

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

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

		@Override
		public void acquire(int displayId) {
		synchronized (mGlobalLock) {
		final ActivityTaskManagerInternal.SleepToken token =
		mRootWindowContainer.createSleepToken(tag, displayId);
		if (!mSleepTokens.contains(displayId)) {
		mSleepTokens.append(displayId,
		mRootWindowContainer.createSleepToken(mTag, displayId));
		updateSleepIfNeededLocked();
		return token;
		}
		}
		}

		@Override
		public void release(int displayId) {
		synchronized (mGlobalLock) {
		final RootWindowContainer.SleepToken token = mSleepTokens.get(displayId);
		if (token != null) {
		mRootWindowContainer.removeSleepToken(token);
		mSleepTokens.remove(displayId);
		}
		}
		}
		}

		@@ -6085,9 +6111,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

		final class LocalService extends ActivityTaskManagerInternal {
		@Override
		public SleepToken acquireSleepToken(String tag, int displayId) {
		public SleepTokenAcquirer createSleepTokenAcquirer(@NonNull String tag) {
		Objects.requireNonNull(tag);
		return ActivityTaskManagerService.this.acquireSleepToken(tag, displayId);
		return new SleepTokenAcquirerImpl(tag);
		}

		@Override

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -596,9 +596,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		private IntArray mDisplayAccessUIDs = new IntArray();

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

		private boolean mSleeping;

		@@ -934,6 +934,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		mAtmService = mWmService.mAtmService;
		mDisplay = display;
		mDisplayId = display.getDisplayId();
		mOffTokenAcquirer = mRootWindowContainer.mDisplayOffTokenAcquirer;
		mWallpaperController = new WallpaperController(mWmService, this);
		display.getDisplayInfo(mDisplayInfo);
		display.getMetrics(mDisplayMetrics);
		@@ -5168,11 +5169,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		final int displayId = mDisplay.getDisplayId();
		if (displayId != DEFAULT_DISPLAY) {
		final int displayState = mDisplay.getState();
		if (displayState == Display.STATE_OFF && mOffToken == null) {
		mOffToken = mAtmService.acquireSleepToken("Display-off", displayId);
		} else if (displayState == Display.STATE_ON && mOffToken != null) {
		mOffToken.release();
		mOffToken = null;
		if (displayState == Display.STATE_OFF) {
		mOffTokenAcquirer.acquire(mDisplayId);
		} else if (displayState == Display.STATE_ON) {
		mOffTokenAcquirer.release(mDisplayId);
		}
		}
		mWmService.requestTraversal();
		@@ -5424,7 +5424,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		mDisplayPolicy.release();

		if (!mAllSleepTokens.isEmpty()) {
		mRootWindowContainer.mSleepTokens.removeAll(mAllSleepTokens);
		mAllSleepTokens.forEach(token ->
		mRootWindowContainer.mSleepTokens.remove(token.mHashKey));
		mAllSleepTokens.clear();
		mAtmService.updateSleepIfNeededLocked();
		}

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

+13 −22

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import android.util.proto.ProtoOutputStream;

		import com.android.internal.policy.IKeyguardDismissCallback;
		import com.android.server.policy.WindowManagerPolicy;
		import com.android.server.wm.ActivityTaskManagerInternal.SleepToken;

		import java.io.PrintWriter;

		@@ -73,11 +72,14 @@ class KeyguardController {
		private final SparseArray<KeyguardDisplayState> mDisplayStates = new SparseArray<>();
		private final ActivityTaskManagerService mService;
		private RootWindowContainer mRootWindowContainer;
		private final ActivityTaskManagerInternal.SleepTokenAcquirer mSleepTokenAcquirer;


		KeyguardController(ActivityTaskManagerService service,
		ActivityStackSupervisor stackSupervisor) {
		mService = service;
		mStackSupervisor = stackSupervisor;
		mSleepTokenAcquirer = mService.new SleepTokenAcquirerImpl("keyguard");
		}

		void setWindowManager(WindowManagerService windowManager) {
		@@ -411,17 +413,17 @@ class KeyguardController {

		private void updateKeyguardSleepToken(int displayId) {
		final KeyguardDisplayState state = getDisplay(displayId);
		if (isKeyguardUnoccludedOrAodShowing(displayId) && state.mSleepToken == null) {
		state.acquiredSleepToken();
		} else if (!isKeyguardUnoccludedOrAodShowing(displayId) && state.mSleepToken != null) {
		state.releaseSleepToken();
		if (isKeyguardUnoccludedOrAodShowing(displayId)) {
		state.mSleepTokenAcquirer.acquire(displayId);
		} else if (!isKeyguardUnoccludedOrAodShowing(displayId)) {
		state.mSleepTokenAcquirer.release(displayId);
		}
		}

		private KeyguardDisplayState getDisplay(int displayId) {
		KeyguardDisplayState state = mDisplayStates.get(displayId);
		if (state == null) {
		state = new KeyguardDisplayState(mService, displayId);
		state = new KeyguardDisplayState(mService, displayId, mSleepTokenAcquirer);
		mDisplayStates.append(displayId, state);
		}
		return state;
		@@ -442,29 +444,18 @@ class KeyguardController {
		private ActivityRecord mDismissingKeyguardActivity;
		private boolean mRequestDismissKeyguard;
		private final ActivityTaskManagerService mService;
		private SleepToken mSleepToken;
		private final ActivityTaskManagerInternal.SleepTokenAcquirer mSleepTokenAcquirer;

		KeyguardDisplayState(ActivityTaskManagerService service, int displayId) {
		KeyguardDisplayState(ActivityTaskManagerService service, int displayId,
		ActivityTaskManagerInternal.SleepTokenAcquirer acquirer) {
		mService = service;
		mDisplayId = displayId;
		mSleepTokenAcquirer = acquirer;
		}

		void onRemoved() {
		mDismissingKeyguardActivity = null;
		releaseSleepToken();
		}

		void acquiredSleepToken() {
		if (mSleepToken == null) {
		mSleepToken = mService.acquireSleepToken("keyguard", mDisplayId);
		}
		}

		void releaseSleepToken() {
		if (mSleepToken != null) {
		mSleepToken.release();
		mSleepToken = null;
		}
		mSleepTokenAcquirer.release(mDisplayId);
		}

		void visibilitiesUpdated(KeyguardController controller, DisplayContent display) {