summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/password
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-03-30 16:30:31 -0700
committerFan Zhang <zhfan@google.com>2018-03-30 16:30:31 -0700
commit1b9b1a2311310fe56f13cf729d6aacda744c04b6 (patch)
tree4363ab1de9b8b45a3ba1f70f3a512eb8b3f5c35d /src/com/android/settings/password
parente6455580494d0ff43ba0adf4653260466341c22d (diff)
downloadpackages_apps_Settings-1b9b1a2311310fe56f13cf729d6aacda744c04b6.tar.gz
packages_apps_Settings-1b9b1a2311310fe56f13cf729d6aacda744c04b6.tar.bz2
packages_apps_Settings-1b9b1a2311310fe56f13cf729d6aacda744c04b6.zip
Remove FingerprintManagerWrapper
No longer needed after robolectric migration Bug: 76167422 Test: robotests Change-Id: I922cde8ac3667081a512cf899af86f68b24485a6
Diffstat (limited to 'src/com/android/settings/password')
-rw-r--r--src/com/android/settings/password/SetNewPasswordController.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index a974da4f0e..a8d51eddd4 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -19,7 +19,6 @@ package com.android.settings.password;
import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
-
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.Nullable;
@@ -36,7 +35,6 @@ import android.os.UserManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.Utils;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
/**
* Business logic for {@link SetNewPasswordActivity}.
@@ -57,7 +55,8 @@ final class SetNewPasswordController {
*/
private final int mTargetUserId;
private final PackageManager mPackageManager;
- @Nullable private final FingerprintManagerWrapper mFingerprintManager;
+ @Nullable
+ private final FingerprintManager mFingerprintManager;
private final DevicePolicyManager mDevicePolicyManager;
private final Ui mUi;
@@ -78,13 +77,9 @@ final class SetNewPasswordController {
}
// Create a wrapper of FingerprintManager for testing, see IFingerPrintManager for details.
final FingerprintManager fingerprintManager = Utils.getFingerprintManagerOrNull(context);
- final FingerprintManagerWrapper fingerprintManagerWrapper =
- fingerprintManager == null
- ? null
- : new FingerprintManagerWrapper(fingerprintManager);
return new SetNewPasswordController(userId,
context.getPackageManager(),
- fingerprintManagerWrapper,
+ fingerprintManager,
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE), ui);
}
@@ -92,7 +87,7 @@ final class SetNewPasswordController {
SetNewPasswordController(
int targetUserId,
PackageManager packageManager,
- FingerprintManagerWrapper fingerprintManager,
+ FingerprintManager fingerprintManager,
DevicePolicyManager devicePolicyManager,
Ui ui) {
mTargetUserId = targetUserId;