Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on
This commit is contained in:
Dianne Hackborn
2012-08-14 19:31:55 -07:00
committed by Android Git Automerger
parent d54bc8009f 48de12c5d1
commit 977abbb887
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -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) {