Merge "Direct return when remove the sleep token which is non-exist." into main (9c73c416) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2902,10 +2902,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		}

		void removeSleepToken(SleepToken token) {
		if (!mSleepTokens.contains(token.mHashKey)) {
		if (mSleepTokens.removeReturnOld(token.mHashKey) == null) {
		Slog.d(TAG, "Remove non-exist sleep token: " + token + " from " + Debug.getCallers(6));
		}
		mSleepTokens.remove(token.mHashKey);
		final DisplayContent display = getDisplayContent(token.mDisplayId);
		if (display == null) {
		Slog.d(TAG, "Remove sleep token for non-existing display: " + token + " from "