Merge changes I69e9cbb6,I187b5a56 into sc-v2-dev am: 3b5edccda0 (7eaefb3e) · Commits · e / os / android_frameworks_base

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

+1 −10

Original line number	Diff line number	Diff line
		@@ -404,7 +404,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private AccessibilityShortcutController mAccessibilityShortcutController;

		boolean mSafeMode;
		private WindowState mKeyguardCandidate = null;

		// Whether to allow dock apps with METADATA_DOCK_HOME to temporarily take over the Home key.
		// This is for car dock and this is updated from resource.
		@@ -3061,7 +3060,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (mKeyguardOccludedChanged) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "transition/occluded changed occluded="
		+ mPendingKeyguardOccluded);
		mKeyguardOccludedChanged = false;
		if (setKeyguardOccludedLw(mPendingKeyguardOccluded, false /* force */,
		transitionStarted)) {
		return FINISH_LAYOUT_REDO_LAYOUT \| FINISH_LAYOUT_REDO_WALLPAPER;
		@@ -3271,14 +3269,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mNavBarVirtualKeyHapticFeedbackEnabled = enabled;
		}

		/** {@inheritDoc} */
		@Override
		public void setKeyguardCandidateLw(WindowState win) {
		mKeyguardCandidate = win;
		setKeyguardOccludedLw(isKeyguardOccluded(), true /* force */,
		false /* keyguardOccludingStarted */);
		}

		/**
		* Updates the occluded state of the Keyguard.
		*
		@@ -3291,6 +3281,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private boolean setKeyguardOccludedLw(boolean isOccluded, boolean force,
		boolean transitionStarted) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "setKeyguardOccluded occluded=" + isOccluded);
		mKeyguardOccludedChanged = false;
		if (isKeyguardOccluded() == isOccluded && !force) {
		return false;
		}

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -721,13 +721,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
		int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
		int icon, int logo, int windowFlags, Configuration overrideConfig, int displayId);

		/**
		* Set or clear a window which can behave as the keyguard.
		*
		* @param win The window which can behave as the keyguard.
		*/
		void setKeyguardCandidateLw(@Nullable WindowState win);

		/**
		* Create and return an animation to re-display a window that was force hidden by Keyguard.
		*/

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -1094,9 +1094,6 @@ public class DisplayPolicy {
		switch (attrs.type) {
		case TYPE_NOTIFICATION_SHADE:
		mNotificationShade = win;
		if (mDisplayContent.isDefaultDisplay) {
		mService.mPolicy.setKeyguardCandidateLw(win);
		}
		break;
		case TYPE_STATUS_BAR:
		mStatusBar = win;
		@@ -1292,9 +1289,6 @@ public class DisplayPolicy {
		mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, null, null);
		} else if (mNotificationShade == win) {
		mNotificationShade = null;
		if (mDisplayContent.isDefaultDisplay) {
		mService.mPolicy.setKeyguardCandidateLw(null);
		}
		} else if (mClimateBarAlt == win) {
		mClimateBarAlt = null;
		mDisplayContent.setInsetProvider(ITYPE_CLIMATE_BAR, null, null);

services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -127,10 +127,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
		};
		}

		@Override
		public void setKeyguardCandidateLw(WindowState win) {
		}

		@Override
		public Animation createHiddenByKeyguardExit(boolean onWallpaper,
		boolean goingToNotificationShade, boolean subtleAnimation) {