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

Merge "Do not show lock screen when SIM is removed" into qt-dev

Browse Source
This commit is contained in:
Lucas Dupin
2019-04-19 15:54:01 +00:00
committed by Android (Google) Code Review
parent 0d257a35a6 28e8005fa9
commit d1792d4bec
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -66,8 +66,6 @@ import android.view.WindowManagerPolicyConstants;
import android.view.animation.Animation; import android.view.animation.Animation;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IKeyguardDismissCallback;
import com.android.internal.policy.IKeyguardDrawnCallback; import com.android.internal.policy.IKeyguardDrawnCallback;
import com.android.internal.policy.IKeyguardExitCallback; import com.android.internal.policy.IKeyguardExitCallback;
@@ -362,7 +360,6 @@ public class KeyguardViewMediator extends SystemUI {
private boolean mWakeAndUnlocking; private boolean mWakeAndUnlocking;
private IKeyguardDrawnCallback mDrawnCallback; private IKeyguardDrawnCallback mDrawnCallback;
private boolean mLockWhenSimRemoved;
private CharSequence mCustomMessage; private CharSequence mCustomMessage;
KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() { KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() {
@@ -465,7 +462,6 @@ public class KeyguardViewMediator extends SystemUI {
if (simState == ABSENT) { if (simState == ABSENT) {
// MVNO SIMs can become transiently NOT_READY when switching networks, // MVNO SIMs can become transiently NOT_READY when switching networks,
// so we should only lock when they are ABSENT. // so we should only lock when they are ABSENT.
onSimAbsentLocked();
if (simWasLocked) { if (simWasLocked) {
if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the " if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "
+ "previous state was locked. Reset the state."); + "previous state was locked. Reset the state.");
@@ -498,7 +494,6 @@ public class KeyguardViewMediator extends SystemUI {
+ "show permanently disabled message in lockscreen."); + "show permanently disabled message in lockscreen.");
resetStateLocked(); resetStateLocked();
} }
onSimAbsentLocked();
} }
break; break;
case READY: case READY:
@@ -509,7 +504,6 @@ public class KeyguardViewMediator extends SystemUI {
+ "previous state was locked. Reset the state."); + "previous state was locked. Reset the state.");
resetStateLocked(); resetStateLocked();
} }
mLockWhenSimRemoved = true;
} }
break; break;
default: default:
@@ -518,18 +512,6 @@ public class KeyguardViewMediator extends SystemUI {
} }
} }
private void onSimAbsentLocked() {
if (isSecure() && mLockWhenSimRemoved && !mShuttingDown) {
mLockWhenSimRemoved = false;
MetricsLogger.action(mContext,
MetricsProto.MetricsEvent.ACTION_LOCK_BECAUSE_SIM_REMOVED, mShowing);
if (!mShowing) {
Log.i(TAG, "SIM removed, showing keyguard");
doKeyguardLocked(null);
}
}
}
@Override @Override
public void onBiometricAuthFailed(BiometricSourceType biometricSourceType) { public void onBiometricAuthFailed(BiometricSourceType biometricSourceType) {
final int currentUser = KeyguardUpdateMonitor.getCurrentUser(); final int currentUser = KeyguardUpdateMonitor.getCurrentUser();