commit 977abbb887cfaf7cd8a0d31235281fbdd639ac19
author Dianne Hackborn <hackbod@android.com> Tue Aug 14 19:31:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 14 19:31:55 2012 -0700
tree 161175fbbc63e0d691e2ad121fca20a10d3333b3
parent d54bc8009f745a5f730fa013bb0084c502b18aa9
parent 48de12c5d1dc8d856724e8a1ec8288d9bfae40cd

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

* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on

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

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
index 02eeedf..5fa6dbf 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -230,7 +230,7 @@
 
     private KeyguardUpdateMonitor mUpdateMonitor;
 
-    private boolean mScreenOn = false;
+    private boolean mScreenOn;
 
     // last known state of the cellular connection
     private String mPhoneState = TelephonyManager.EXTRA_STATE_IDLE;
@@ -318,6 +318,8 @@
         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) {