Merge "services.core.unboosted - call PermissionEnforcer helper on methods annotated with @EnforcePermission"

services/core/java/com/android/server/biometrics/BiometricService.java

@@ -780,6 +780,8 @@ public class BiometricService extends SystemService {
         @Override // Binder call
         public void resetLockout(
                 int userId, byte[] hardwareAuthToken) {
+            super.resetLockout_enforcePermission();
+
             Slog.d(TAG, "resetLockout(userId=" + userId
                     + ", hat=" + (hardwareAuthToken == null ? "null " : "present") + ")");
             mBiometricContext.getAuthSessionCoordinator()

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

@@ -942,6 +942,8 @@ public class FingerprintService extends SystemService {
         @android.annotation.EnforcePermission(android.Manifest.permission.USE_BIOMETRIC_INTERNAL)
         @Override
         public void setUdfpsOverlay(@NonNull IUdfpsOverlay controller) {
+            super.setUdfpsOverlay_enforcePermission();
+
             for (ServiceProvider provider : mRegistry.getProviders()) {
                 provider.setUdfpsOverlay(controller);
             }

services/core/java/com/android/server/input/InputManagerService.java

@@ -2677,6 +2677,8 @@ public class InputManagerService extends IInputManager.Stub
     @EnforcePermission(Manifest.permission.BLUETOOTH)
     @Override
     public String getInputDeviceBluetoothAddress(int deviceId) {
+        super.getInputDeviceBluetoothAddress_enforcePermission();
+
         return mNative.getBluetoothAddress(deviceId);
     }