am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

diff --cc policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 0f1b3f4,3f4bcd4..0076468
--- 1/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
--- 2/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@@ -2937,11 -2936,9 +2938,11 @@@ public class PhoneWindowManager impleme
      @Override
      public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) {
          mTopFullscreenOpaqueWindowState = null;
-         mHideWindowBehindKeyguard = false;
+         mAppsToBeHidden.clear();
          mForceStatusBar = false;
          mForceStatusBarFromKeyguard = false;
 +        mForcingShowNavBar = false;
 +        mForcingShowNavBarLayer = -1;
          
          mHideLockScreen = false;
          mAllowLockscreenWhenOn = false;