am 40627de3: Merge "Remove unnecessary references in WindowManagerService" (d3b9dd6c) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wm/WindowManagerService.java

+14 −20

Original line number	Diff line number	Diff line
		@@ -4139,8 +4139,7 @@ public class WindowManagerService extends IWindowManager.Stub
		mStartingIconInTransition = false;
		mSkipAppTransitionAnimation = false;
		mH.removeMessages(H.APP_TRANSITION_TIMEOUT);
		mH.sendMessageDelayed(mH.obtainMessage(H.APP_TRANSITION_TIMEOUT),
		5000);
		mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, 5000);
		}
		}
		}
		@@ -4711,8 +4710,7 @@ public class WindowManagerService extends IWindowManager.Stub
		if (mAppsFreezingScreen == 1) {
		startFreezingDisplayLocked(false, 0, 0);
		mH.removeMessages(H.APP_FREEZE_TIMEOUT);
		mH.sendMessageDelayed(mH.obtainMessage(H.APP_FREEZE_TIMEOUT),
		5000);
		mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 5000);
		}
		}
		final int N = wtoken.allAppWindows.size();
		@@ -5232,8 +5230,7 @@ public class WindowManagerService extends IWindowManager.Stub
		try {
		startFreezingDisplayLocked(false, exitAnim, enterAnim);
		mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT);
		mH.sendMessageDelayed(mH.obtainMessage(H.CLIENT_FREEZE_TIMEOUT),
		5000);
		mH.sendEmptyMessageDelayed(H.CLIENT_FREEZE_TIMEOUT, 5000);
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		@@ -5361,7 +5358,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		// Persist setting
		mH.obtainMessage(H.PERSIST_ANIMATION_SCALE).sendToTarget();
		mH.sendEmptyMessage(H.PERSIST_ANIMATION_SCALE);
		}

		public void setAnimationScales(float[] scales) {
		@@ -5383,7 +5380,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		// Persist setting
		mH.obtainMessage(H.PERSIST_ANIMATION_SCALE).sendToTarget();
		mH.sendEmptyMessage(H.PERSIST_ANIMATION_SCALE);
		}

		private void setAnimatorDurationScale(float scale) {
		@@ -5493,8 +5490,7 @@ public class WindowManagerService extends IWindowManager.Stub
		hideBootMessagesLocked();
		// If the screen still doesn't come up after 30 seconds, give
		// up and turn it on.
		Message msg = mH.obtainMessage(H.BOOT_TIMEOUT);
		mH.sendMessageDelayed(msg, 30*1000);
		mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 30*1000);
		}

		mPolicy.systemBooted();
		@@ -5517,7 +5513,7 @@ public class WindowManagerService extends IWindowManager.Stub
		if (!mSystemBooted && !mShowingBootMessages) {
		return;
		}
		mH.sendMessage(mH.obtainMessage(H.ENABLE_SCREEN));
		mH.sendEmptyMessage(H.ENABLE_SCREEN);
		}

		public void performBootTimeout() {
		@@ -6079,7 +6075,7 @@ public class WindowManagerService extends IWindowManager.Stub

		mWindowsFreezingScreen = true;
		mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
		mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_FREEZE_TIMEOUT),
		mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT,
		WINDOW_FREEZE_TIMEOUT_DURATION);
		mWaitingForConfig = true;
		getDefaultDisplayContentLocked().layoutNeeded = true;
		@@ -7608,8 +7604,7 @@ public class WindowManagerService extends IWindowManager.Stub
		if (mAnimator.mAnimating \|\| mLayoutToAnim.mAnimationScheduled) {
		// If we are animating, don't do the gc now but
		// delay a bit so we don't interrupt the animation.
		mH.sendMessageDelayed(mH.obtainMessage(H.FORCE_GC),
		2000);
		sendEmptyMessageDelayed(H.FORCE_GC, 2000);
		return;
		}
		// If we are currently rotating the display, it will
		@@ -7734,7 +7729,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// Used to send multiple changes from the animation side to the layout side.
		synchronized (mWindowMap) {
		if (copyAnimToLayoutParamsLocked()) {
		mH.sendEmptyMessage(CLEAR_PENDING_ACTIONS);
		sendEmptyMessage(CLEAR_PENDING_ACTIONS);
		performLayoutAndPlaceSurfacesLocked();
		}
		}
		@@ -8323,7 +8318,7 @@ public class WindowManagerService extends IWindowManager.Stub

		if (mWindowsChanged && !mWindowChangeListeners.isEmpty()) {
		mH.removeMessages(H.REPORT_WINDOWS_CHANGE);
		mH.sendMessage(mH.obtainMessage(H.REPORT_WINDOWS_CHANGE));
		mH.sendEmptyMessage(H.REPORT_WINDOWS_CHANGE);
		}
		} catch (RuntimeException e) {
		mInLayout = false;
		@@ -8519,8 +8514,8 @@ public class WindowManagerService extends IWindowManager.Stub
		// XXX should probably keep timeout from
		// when we first froze the display.
		mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
		mH.sendMessageDelayed(mH.obtainMessage(
		H.WINDOW_FREEZE_TIMEOUT), WINDOW_FREEZE_TIMEOUT_DURATION);
		mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT,
		WINDOW_FREEZE_TIMEOUT_DURATION);
		}
		}
		}
		@@ -10197,8 +10192,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// processes holds on others can be released if they are
		// no longer needed.
		mH.removeMessages(H.FORCE_GC);
		mH.sendMessageDelayed(mH.obtainMessage(H.FORCE_GC),
		2000);
		mH.sendEmptyMessageDelayed(H.FORCE_GC, 2000);

		mScreenFrozenLock.release();