diff --git a/policy/com/android/internal/policy/impl/PhoneWindow.java b/policy/com/android/internal/policy/impl/PhoneWindow.java
index 0d26bfbbfac38..f3f166bba5516 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindow.java
@@ -200,7 +200,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                     InputMethodManager imm = (InputMethodManager)
                             getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
                     if (imm != null) {
-                        imm.showSoftInputUnchecked(InputMethodManager.SHOW_FORCED);
+                        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
                     }
                 } break;
                 case MSG_CALL_LONG_PRESS_COMPLETE: {
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index d1b757604465f..8ecb2b671a610 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -277,9 +277,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 rotation =  (orientation >= 270 - _LOWER_THRESHOLD
                         && orientation <= 270 + threshold)
                         ? Surface.ROTATION_90 : Surface.ROTATION_0;
-            } else if (orientation == WindowOrientationListener.ORIENTATION_FLAT) {
-                // return portrait 
-                rotation = Surface.ROTATION_0;
             } else {
                 // ignore orientation value
                 return;