Merge "Fix SIM PIN listener registration" into qt-dev

am: 873734d144

Change-Id: Ia3b8409c6d6660f8a9af4579995431d647542498
This commit is contained in:
Lucas Dupin
2019-04-20 12:16:00 -07:00
committed by android-build-merger

View File

@@ -135,7 +135,6 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
return;
}
// Sending empty PIN here to query the number of remaining PIN attempts
new CheckSimPin("", mSubId) {
void onSimCheckResponse(final int result, final int attemptsRemaining) {
@@ -216,22 +215,17 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
}
@Override
protected void onAttachedToWindow() {
super.onAttachedToWindow();
public void showUsabilityHint() {
}
@Override
public void onResume(int reason) {
super.onResume(reason);
KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);
resetState();
}
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallback);
}
@Override
public void showUsabilityHint() {
}
@Override
public void onPause() {
// dismiss the dialog.
@@ -239,6 +233,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
mSimUnlockProgressDialog.dismiss();
mSimUnlockProgressDialog = null;
}
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallback);
}
/**