Merge "Don't consider input restricted if keyguard is still disabled." into ics (964474de) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -598,7 +598,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		* was suppressed by an app that disabled the keyguard or we haven't been provisioned yet.
		*/
		public boolean isInputRestricted() {
		return mShowing \|\| mNeedToReshowWhenReenabled \|\| !mUpdateMonitor.isDeviceProvisioned();
		if (mShowing) {
		return true;
		}
		if (mExternallyEnabled && mNeedToReshowWhenReenabled) {
		return true;
		}
		return !mUpdateMonitor.isDeviceProvisioned();
		}

		/**