9d357ea072
Entering the wrong credential in ConfirmDeviceCredentials should also count as failed attempts for the password, after which the DPC have set a restriction to wipe the work profile. Fixed related issues, such as the CredentialChecker re-sending the result after onResume causing additional attempts to be counted. The new error message String is also displayed initially when there are pending attempts to inform the user that they are not starting from fresh. Bug: 26677759 Change-Id: I70cfae4c05e705ad7fe93bc071426459b79e7d0c
80 lines
2.4 KiB
Java
80 lines
2.4 KiB
Java
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
import android.app.Fragment;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
|
|
/**
|
|
* An invisible retained fragment to track lock check result.
|
|
*/
|
|
public class CredentialCheckResultTracker extends Fragment {
|
|
|
|
private Listener mListener;
|
|
private boolean mHasResult = false;
|
|
|
|
private boolean mResultMatched;
|
|
private Intent mResultData;
|
|
private int mResultTimeoutMs;
|
|
private int mResultEffectiveUserId;
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
setRetainInstance(true);
|
|
}
|
|
|
|
public void setListener(Listener listener) {
|
|
if (mListener == listener) {
|
|
return;
|
|
}
|
|
|
|
mListener = listener;
|
|
if (mListener != null && mHasResult) {
|
|
mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
|
|
mResultEffectiveUserId, false /* newResult */);
|
|
}
|
|
}
|
|
|
|
public void setResult(boolean matched, Intent intent, int timeoutMs, int effectiveUserId) {
|
|
mResultMatched = matched;
|
|
mResultData = intent;
|
|
mResultTimeoutMs = timeoutMs;
|
|
mResultEffectiveUserId = effectiveUserId;
|
|
|
|
mHasResult = true;
|
|
if (mListener != null) {
|
|
mListener.onCredentialChecked(mResultMatched, mResultData, mResultTimeoutMs,
|
|
mResultEffectiveUserId, true /* newResult */);
|
|
}
|
|
}
|
|
|
|
public void clearResult() {
|
|
mHasResult = false;
|
|
mResultMatched = false;
|
|
mResultData = null;
|
|
mResultTimeoutMs = 0;
|
|
mResultEffectiveUserId = 0;
|
|
}
|
|
|
|
interface Listener {
|
|
public void onCredentialChecked(boolean matched, Intent intent, int timeoutMs,
|
|
int effectiveUserId, boolean newResult);
|
|
}
|
|
}
|