Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ec1f8d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 595b6565: am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting... 

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

* commit '595b6565':
  Keep keyguard from starting after finished call when screen is on
parents 5cdb2480 595b6565

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

+3 −1
Original line number Diff line number Diff line
@@ -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 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) {