More random optimzations to make things go faster (50150158) · Commits · e / os / android_frameworks_base

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

+23 −17

Original line number	Diff line number	Diff line
		@@ -2226,6 +2226,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		@Override
		public boolean canBeHiddenByKeyguardLw(WindowState win) {

		// Keyguard visibility of window from activities are determined over activity visibility.
		if (win.getAppToken() != null) {
		return false;
		}
		switch (win.getAttrs().type) {
		case TYPE_STATUS_BAR:
		case TYPE_NAVIGATION_BAR:
		@@ -2239,19 +2244,30 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		private boolean shouldBeHiddenByKeyguard(WindowState win, WindowState imeTarget) {
		final LayoutParams attrs = win.getAttrs();

		// Keyguard visibility of window from activities are determined over activity visibility.
		if (win.getAppToken() != null) {
		return false;
		boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER
		&& !mWindowManagerInternal.isStackVisibleLw(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
		if (hideDockDivider) {
		return true;
		}

		// If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered
		// hidden because it's in the process of hiding, but it's still being shown on screen.
		// In that case, we want to continue hiding the IME until the windows have completed
		// drawing. This way, we know that the IME can be safely shown since the other windows are
		// now shown.
		final boolean hideIme = win.isInputMethodWindow()
		&& (mAodShowing \|\| !mDefaultDisplayPolicy.isWindowManagerDrawComplete());
		if (hideIme) {
		return true;
		}

		final LayoutParams attrs = win.getAttrs();
		final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleLw()
		&& (imeTarget.canShowWhenLocked() \|\| !canBeHiddenByKeyguardLw(imeTarget));

		// Show IME over the keyguard if the target allows it
		boolean allowWhenLocked = (win.isInputMethodWindow() \|\| imeTarget == this)
		&& showImeOverKeyguard;
		boolean allowWhenLocked = win.isInputMethodWindow() && showImeOverKeyguard;

		final boolean isKeyguardShowing = mKeyguardDelegate.isShowing();

		@@ -2262,17 +2278,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		\|\| (attrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0;
		}

		boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER
		&& !mWindowManagerInternal.isStackVisibleLw(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
		// If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered
		// hidden because it's in the process of hiding, but it's still being shown on screen.
		// In that case, we want to continue hiding the IME until the windows have completed
		// drawing. This way, we know that the IME can be safely shown since the other windows are
		// now shown.
		final boolean hideIme = win.isInputMethodWindow()
		&& (mAodShowing \|\| !mDefaultDisplayPolicy.isWindowManagerDrawComplete());
		return (isKeyguardShowing && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY)
		\|\| hideDockDivider \|\| hideIme;
		return isKeyguardShowing && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY;
		}

		/** {@inheritDoc} */

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2349,7 +2349,7 @@ public class DisplayPolicy {
		}

		// Voice interaction overrides both top fullscreen and top docked.
		if (affectsSystemUi && win.getAttrs().type == TYPE_VOICE_INTERACTION) {
		if (affectsSystemUi && attrs.type == TYPE_VOICE_INTERACTION) {
		if (mTopFullscreenOpaqueWindowState == null) {
		mTopFullscreenOpaqueWindowState = win;
		if (mTopFullscreenOpaqueOrDimmingWindowState == null) {

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2525,6 +2525,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}

		boolean showLw(boolean doAnimation, boolean requestAnim) {
		if (mPolicyVisibility && mPolicyVisibilityAfterAnim) {
		// Already showing.
		return false;
		}
		if (isHiddenFromUserLocked()) {
		return false;
		}
		@@ -2545,10 +2549,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		// This is an alert window that is currently force hidden.
		return false;
		}
		if (mPolicyVisibility && mPolicyVisibilityAfterAnim) {
		// Already showing.
		return false;
		}
		if (DEBUG_VISIBILITY) Slog.v(TAG, "Policy visibility true: " + this);
		if (doAnimation) {
		if (DEBUG_VISIBILITY) Slog.v(TAG, "doAnimation: mPolicyVisibility="