resolved conflicts for merge of f05f7ab1 to master (5704f326) · Commits · e / os / android_frameworks_base

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1458,18 +1458,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		} else if (mHideLockScreen) {
		if (mKeyguard.hideLw(true)) {
		mKeyguardMediator.setHidden(true);
		changes \|= FINISH_LAYOUT_REDO_LAYOUT
		\| FINISH_LAYOUT_REDO_CONFIG
		\| FINISH_LAYOUT_REDO_WALLPAPER;
		}
		mKeyguardMediator.setHidden(true);
		} else {
		if (mKeyguard.showLw(true)) {
		mKeyguardMediator.setHidden(false);
		changes \|= FINISH_LAYOUT_REDO_LAYOUT
		\| FINISH_LAYOUT_REDO_CONFIG
		\| FINISH_LAYOUT_REDO_WALLPAPER;
		}
		mKeyguardMediator.setHidden(false);
		}
		}