Merge "Missed a spot, needInput was not getting called." into jb-mr1-dev

Craig Mautner · Android (Google) Code Review · commit 6e2cbccc46e7 · 2012-09-28T12:07:17.000-07:00
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -547,8 +547,9 @@ private void showSecurityScreen(SecurityMode securityMode) {
         oldView.onPause();
         newView.onResume();
 
+        final boolean needsInput = newView.needsInput();
         if (mViewMediatorCallback != null) {
-            mViewMediatorCallback.setNeedsInput(newView.needsInput());
+            mViewMediatorCallback.setNeedsInput(needsInput);
         }
 
         // Find and show this child.

Original file line number	Diff line number	Diff line change
`@@ -547,8 +547,9 @@ private void showSecurityScreen(SecurityMode securityMode) {`
`547`	`547`	`oldView.onPause();`
`548`	`548`	`newView.onResume();`
`549`	`549`
	`550`	`+ final boolean needsInput = newView.needsInput();`
`550`	`551`	`if (mViewMediatorCallback != null) {`
`551`		`- mViewMediatorCallback.setNeedsInput(newView.needsInput());`
	`552`	`+ mViewMediatorCallback.setNeedsInput(needsInput);`
`552`	`553`	`}`
`553`	`554`
`554`	`555`	`// Find and show this child.`