am 977abbb: am 48de12c: Merge "Keep keyguard from starting after finished call when screen is on"

* commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19':
  Keep keyguard from starting after finished call when screen is on

Author: Dianne Hackborn

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

@@ -228,7 +228,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback {
 
     private KeyguardUpdateMonitor mUpdateMonitor;
 
-    private boolean mScreenOn = false;
+    private boolean mScreenOn;
 
     // last known state of the cellular connection
     private String mPhoneState = TelephonyManager.EXTRA_STATE_IDLE;
@@ -393,6 +393,8 @@ public KeyguardViewMediator(Context context, PhoneWindowManager callback,
         final ContentResolver cr = mContext.getContentResolver();
         mShowLockIcon = (Settings.System.getInt(cr, "show_status_bar_lock", 0) == 1);
 
+        mScreenOn = mPM.isScreenOn();
+
         mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
         String soundPath = Settings.System.getString(cr, Settings.System.LOCK_SOUND);
         if (soundPath != null) {