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

Commit 204eadc6 authored by Danielle Millett's avatar Danielle Millett Committed by Android Git Automerger
Browse files

am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call -... 

am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev

* commit '4ec2381b':
  Suppressing Face Unlock during phone call - fix b/7339069
parents c7d25978 4ec2381b

policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu 
                    Context.POWER_SERVICE);

            // TODO: Some of these conditions are handled in KeyguardSecurityModel and may not be

            // necessary here.

            if (monitor.getPhoneState() != TelephonyManager.CALL_STATE_RINGING

            if (monitor.getPhoneState() == TelephonyManager.CALL_STATE_IDLE

                    && !monitor.getMaxBiometricUnlockAttemptsReached()

                    && !backupIsTimedOut

                    && powerManager.isScreenOn()) {

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityModel.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.internal.policy.impl.keyguard; 


import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.IccCardConstants;

import com.android.internal.widget.LockPatternUtils;
@@ -66,7 +67,8 @@ public class KeyguardSecurityModel { 
        final boolean backupIsTimedOut = monitor.getFailedUnlockAttempts() >=

                LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT;

        return monitor.getMaxBiometricUnlockAttemptsReached() || backupIsTimedOut

                || !monitor.isAlternateUnlockEnabled();

                || !monitor.isAlternateUnlockEnabled()

                || monitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE;

    }



    SecurityMode getSecurityMode() {