diff options
| author | 2012-08-14 18:50:59 -0700 | |
|---|---|---|
| committer | 2012-08-14 18:51:00 -0700 | |
| commit | 48de12c5d1dc8d856724e8a1ec8288d9bfae40cd (patch) | |
| tree | d2a2780b6078d9481e0f4390763301604c2f79cb | |
| parent | 9064a48365c131ef5f64b26ab33dd40a7d1246a7 (diff) | |
| parent | 4b71686d09ef0e13e729338e3a549f2f63f80db1 (diff) | |
Merge "Keep keyguard from starting after finished call when screen is on"
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 02eeedfd94cc..5fa6dbf93d30 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 @@ 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; @@ -318,6 +318,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback, 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) { |