Revert "Enable jcardsim simulator for Strongbox via new flag."

This reverts commit 449942b.

Bug: b/417821103

Author: jemoreira

base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp

@@ -210,21 +210,6 @@ Result<std::unordered_map<std::string, std::string>> BootconfigArgsFromConfig(
           ? "com.android.hardware.gatekeeper.nonsecure"
           : "com.android.hardware.gatekeeper.cf_remote";
 
-  // jcardsimulator
-  if (secure_hals.count(SecureHal::kGuestStrongboxInsecure)) {
-    bootconfig_args
-        ["androidboot.vendor.apex.com.android.hardware.secure_element"] =
-            "com.android.hardware.secure_element_jcardsim";
-    bootconfig_args["androidboot.vendor.apex.com.android.hardware.strongbox"] =
-        "com.android.hardware.strongbox";
-  } else {
-    bootconfig_args
-        ["androidboot.vendor.apex.com.android.hardware.secure_element"] =
-            "com.android.hardware.secure_element";
-    bootconfig_args["androidboot.vendor.apex.com.android.hardware.strongbox"] =
-        "none";
-  }
-
   bootconfig_args
       ["androidboot.vendor.apex.com.android.hardware.graphics.composer"] =
           instance.hwcomposer() == kHwComposerDrm

base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc

@@ -480,10 +480,6 @@ DEFINE_vec(enable_audio, fmt::format("{}", CF_DEFAULTS_ENABLE_AUDIO),
 DEFINE_vec(enable_usb, fmt::format("{}", CF_DEFAULTS_ENABLE_USB),
            "Whether to allow USB passthrough on the device");
 
-DEFINE_vec(enable_jcard_simulator,
-           fmt::format("{}", CF_DEFAULTS_ENABLE_JCARD_SIMULATOR),
-           "Whether to allow host jcard simulator on the device");
-
 DEFINE_vec(camera_server_port, std::to_string(CF_DEFAULTS_CAMERA_SERVER_PORT),
               "camera vsock port");
 
@@ -1313,8 +1309,6 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
       CF_EXPECT(GET_FLAG_STR_VALUE(vhost_user_vsock));
   std::vector<std::string> ril_dns_vec =
       CF_EXPECT(GET_FLAG_STR_VALUE(ril_dns));
-  std::vector<bool> enable_jcard_simulator_vec =
-      CF_EXPECT(GET_FLAG_BOOL_VALUE(enable_jcard_simulator));
 
   // At this time, FLAGS_enable_sandbox comes from SetDefaultFlagsForCrosvm
   std::vector<bool> enable_sandbox_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(
@@ -1592,25 +1586,6 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
     instance.set_audio_output_streams_count(
         guest_configs[instance_index].output_audio_streams_count);
 
-    // jcardsim
-    instance.set_enable_jcard_simulator(
-        enable_jcard_simulator_vec[instance_index]);
-
-    if (enable_jcard_simulator_vec[instance_index]) {
-      const auto& secure_hals = CF_EXPECT(tmp_config_obj.secure_hals());
-      if (0 == secure_hals.count(SecureHal::kGuestStrongboxInsecure)) {
-        // When the enable_jcard_simulator flag is enabled, include the keymint
-        // and secure_element hals, which interact with jcard simulator.
-        static constexpr char kDefaultSecure[] =
-            "oemlock,guest_keymint_insecure,guest_gatekeeper_insecure,guest_"
-            "strongbox_insecure";
-
-        auto secure_hals = CF_EXPECT(ParseSecureHals(kDefaultSecure));
-        CF_EXPECT(ValidateSecureHals(secure_hals));
-        tmp_config_obj.set_secure_hals(secure_hals);
-      }
-    }
-
     if (vhost_user_vsock_vec[instance_index] == kVhostUserVsockModeAuto) {
       std::set<Arch> default_on_arch = {Arch::Arm64};
       if (guest_configs[instance_index].vhost_user_vsock) {

base/cvd/cuttlefish/host/commands/assemble_cvd/flags_defaults.h

@@ -218,9 +218,6 @@
 // USB Passhtrough default parameters
 #define CF_DEFAULTS_ENABLE_USB false
 
-// Jcardsim default parameters
-#define CF_DEFAULTS_ENABLE_JCARD_SIMULATOR false
-
 // Streaming default parameters
 #define CF_DEFAULTS_START_WEBRTC false
 #define CF_DEFAULTS_START_WEBRTC_SIG_SERVER true

base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h

@@ -638,7 +638,6 @@ class CuttlefishConfig {
     bool fail_fast() const;
     bool vhost_user_block() const;
     std::string ti50_emulator() const;
-    bool enable_jcard_simulator() const;
 
     // Kernel and bootloader logging
     bool enable_kernel_log() const;
@@ -877,8 +876,6 @@ class CuttlefishConfig {
     void set_fail_fast(bool fail_fast);
     void set_vhost_user_block(bool qemu_vhost_user_block);
     void set_ti50_emulator(const std::string& ti50_emulator);
-    // jcardsim
-    void set_enable_jcard_simulator(bool enable);
 
     // Kernel and bootloader logging
     void set_enable_kernel_log(bool enable_kernel_log);

base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp

@@ -1164,16 +1164,6 @@ std::string CuttlefishConfig::InstanceSpecific::ti50_emulator() const {
   return (*Dictionary())[kTi50].asString();
 }
 
-// jcardsim
-static constexpr char kEnableJcardSimulator[] = "enable_jcard_simulator";
-void CuttlefishConfig::MutableInstanceSpecific::set_enable_jcard_simulator(
-    bool enable_jcard_simulator) {
-  (*Dictionary())[kEnableJcardSimulator] = enable_jcard_simulator;
-}
-bool CuttlefishConfig::InstanceSpecific::enable_jcard_simulator() const {
-  return (*Dictionary())[kEnableJcardSimulator].asBool();
-}
-
 static constexpr char kEnableWebRTC[] = "enable_webrtc";
 void CuttlefishConfig::MutableInstanceSpecific::set_enable_webrtc(bool enable_webrtc) {
   (*Dictionary())[kEnableWebRTC] = enable_webrtc;

base/cvd/cuttlefish/host/libs/config/secure_hals.cpp

@@ -51,7 +51,6 @@ NoDestructor<std::unordered_map<std::string_view, SecureHal>> kMapping([] {
       {"oemlock", SecureHal::kHostOemlockSecure},
       {"host_oemlock_secure", SecureHal::kHostOemlockSecure},
       {"host_secure_oemlock", SecureHal::kHostOemlockSecure},
-      {"guest_strongbox_insecure", SecureHal::kGuestStrongboxInsecure},
   };
 }());
 
@@ -116,8 +115,6 @@ std::string ToString(SecureHal hal_in) {
       return "host_oemlock_insecure";
     case SecureHal::kHostOemlockSecure:
       return "host_oemlock_secure";
-    case SecureHal::kGuestStrongboxInsecure:
-      return "guest_strongbox_insecure";
   }
 }
 

base/cvd/cuttlefish/host/libs/config/secure_hals.h

@@ -26,7 +26,6 @@ enum class SecureHal {
   kGuestGatekeeperInsecure,
   kGuestKeymintInsecure,
   kGuestKeymintTrustyInsecure,
-  kGuestStrongboxInsecure,
   kHostKeymintInsecure,
   kHostKeymintSecure,
   kHostGatekeeperInsecure,

base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp

@@ -887,15 +887,6 @@ Result<std::vector<MonitorCommand>> CrosvmManager::StartCommands(
     crosvm_cmd.AddHvcSink();
   }
 
-  if (instance.enable_jcard_simulator()) {
-    // /dev/hvc17 = JCardSimulator
-    crosvm_cmd.AddHvcReadWrite(
-        instance.PerInstanceInternalPath("jcardsim_fifo_vm.out"),
-        instance.PerInstanceInternalPath("jcardsim_fifo_vm.in"));
-  } else {
-    crosvm_cmd.AddHvcSink();
-  }
-
   for (auto i = 0; i < VmManager::kMaxDisks - disk_num; i++) {
     crosvm_cmd.AddHvcSink();
   }

base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp

@@ -656,13 +656,6 @@ Result<std::vector<MonitorCommand>> QemuManager::StartCommands(
     add_hvc_sink();
   }
 
-  if (instance.enable_jcard_simulator()) {
-    // /dev/hvc17 = keymint (jcardsim implementation)
-    add_hvc(instance.PerInstanceInternalPath("jcardsim_fifo_vm"));
-  } else {
-    add_hvc_sink();
-  }
-
   auto disk_num = instance.virtual_disk_paths().size();
 
   for (auto i = 0; i < VmManager::kMaxDisks - disk_num; i++) {

base/cvd/cuttlefish/host/libs/vm_manager/vm_manager.h

@@ -64,8 +64,7 @@ class VmManager {
   // - /dev/hvc14 = MCU control
   // - /dev/hvc15 = MCU UART
   // - /dev/hvc16 = Ti50 TPM FIFO
-  // - /dev/hvc17 = jcardsimulator
-  static const int kDefaultNumHvcs = 18;
+  static const int kDefaultNumHvcs = 17;
 
   // This is the number of virtual disks (block devices) that should be
   // configured by the VmManager. Related to the description above regarding