Remove FingerprintManagerWrapper

No longer needed after robolectric migration

Bug: 76167422
Test: robotests
Change-Id: I922cde8ac3667081a512cf899af86f68b24485a6

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java

@@ -39,7 +39,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.testutils.shadow.ShadowVibrator;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -62,7 +61,7 @@ import java.util.concurrent.TimeUnit;
 public class FingerprintEnrollEnrollingTest {
 
     @Mock
-    private FingerprintManagerWrapper mFingerprintManager;
+    private FingerprintManager mFingerprintManager;
 
     private FingerprintEnrollEnrolling mActivity;
 

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java

@@ -35,7 +35,6 @@ import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -55,7 +54,7 @@ import org.robolectric.shadows.ShadowActivity.IntentForResult;
 public class FingerprintEnrollFindSensorTest {
 
     @Mock
-    private FingerprintManagerWrapper mFingerprintManager;
+    private FingerprintManager mFingerprintManager;
 
     private FingerprintEnrollFindSensor mActivity;
 

tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java

@@ -22,6 +22,7 @@ import static org.robolectric.RuntimeEnvironment.application;
 
 import android.app.AlertDialog;
 import android.content.Intent;
+import android.hardware.fingerprint.FingerprintManager;
 import android.widget.Button;
 
 import com.android.settings.R;
@@ -30,7 +31,6 @@ import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -48,7 +48,7 @@ import org.robolectric.shadows.ShadowAlertDialog;
 public class SetupFingerprintEnrollFindSensorTest {
 
     @Mock
-    private FingerprintManagerWrapper mFingerprintManager;
+    private FingerprintManager mFingerprintManager;
 
     @Before
     public void setUp() {
@@ -65,11 +65,12 @@ public class SetupFingerprintEnrollFindSensorTest {
     @Test
     public void fingerprintEnroll_showsAlert_whenClickingSkip() {
         final Intent intent = new Intent()
-            // Set the challenge token so the confirm screen will not be shown
-            .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
+                // Set the challenge token so the confirm screen will not be shown
+                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
 
         final SetupFingerprintEnrollFindSensor activity =
-            Robolectric.buildActivity(SetupFingerprintEnrollFindSensor.class, intent).setup().get();
+                Robolectric.buildActivity(SetupFingerprintEnrollFindSensor.class,
+                        intent).setup().get();
 
         final Button skipButton = activity.findViewById(R.id.skip_button);
         skipButton.performClick();

tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java

@@ -17,8 +17,10 @@
 package com.android.settings.password;
 
 import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
+        .MINIMUM_QUALITY_KEY;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
@@ -34,10 +36,10 @@ import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,18 +55,18 @@ public final class SetNewPasswordControllerTest {
     private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
 
     @Mock
-    PackageManager mPackageManager;
+    private PackageManager mPackageManager;
     @Mock
-    FingerprintManagerWrapper mFingerprintManager;
+    private FingerprintManager mFingerprintManager;
     @Mock
-    DevicePolicyManager mDevicePolicyManager;
-
+    private DevicePolicyManager mDevicePolicyManager;
     @Mock
     private SetNewPasswordController.Ui mUi;
+
     private SetNewPasswordController mSetNewPasswordController;
 
     @Before
-    public void setUp()  {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         mSetNewPasswordController = new SetNewPasswordController(
                 CURRENT_USER_ID, mPackageManager, mFingerprintManager, mDevicePolicyManager, mUi);

tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java

@@ -18,11 +18,11 @@ package com.android.settings.testutils.shadow;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.hardware.fingerprint.FingerprintManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.settings.Utils;
-import com.android.settings.wrapper.FingerprintManagerWrapper;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -33,7 +33,7 @@ import java.util.Map;
 @Implements(Utils.class)
 public class ShadowUtils {
 
-    private static FingerprintManagerWrapper sFingerprintManager = null;
+    private static FingerprintManager sFingerprintManager = null;
     private static boolean sIsUserAMonkey;
     private static boolean sIsDemoUser;
     private static ComponentName sDeviceOwnerComponentName;
@@ -45,11 +45,11 @@ public class ShadowUtils {
     }
 
     @Implementation
-    public static FingerprintManagerWrapper getFingerprintManagerWrapperOrNull(Context context) {
+    public static FingerprintManager getFingerprintManagerOrNull(Context context) {
         return sFingerprintManager;
     }
 
-    public static void setFingerprintManager(FingerprintManagerWrapper fingerprintManager) {
+    public static void setFingerprintManager(FingerprintManager fingerprintManager) {
         sFingerprintManager = fingerprintManager;
     }