[skip ci] Merge "Revert "Fix the kDefaultModemTechnoloy value"" into main

GitOrigin-RevId: 19b76b2

Author: bohu-google

staging/host/commands/modem_simulator/network_service.h

@@ -61,16 +61,6 @@ class NetworkService : public ModemService, public std::enable_shared_from_this<
  void OnDataRegisterStateChanged();
  void OnSignalStrengthChanged();
 
- enum ModemTechnology {
- M_MODEM_TECH_GSM = 1 << 0,
- M_MODEM_TECH_WCDMA = 1 << 1,
- M_MODEM_TECH_CDMA = 1 << 2,
- M_MODEM_TECH_EVDO = 1 << 3,
- M_MODEM_TECH_TDSCDMA = 1 << 4,
- M_MODEM_TECH_LTE = 1 << 5,
- M_MODEM_TECH_NR = 1 << 6,
- };
-
  enum RegistrationState {
  NET_REGISTRATION_UNREGISTERED = 0,
  NET_REGISTRATION_HOME = 1,
@@ -284,6 +274,15 @@ class NetworkService : public ModemService, public std::enable_shared_from_this<
  NetworkRegistrationStatus voice_registration_status_;
  NetworkRegistrationStatus data_registration_status_;
 
+ enum ModemTechnology {
+ M_MODEM_TECH_GSM = 1 << 0,
+ M_MODEM_TECH_WCDMA = 1 << 1,
+ M_MODEM_TECH_CDMA = 1 << 2,
+ M_MODEM_TECH_EVDO = 1 << 3,
+ M_MODEM_TECH_TDSCDMA= 1 << 4,
+ M_MODEM_TECH_LTE = 1 << 5,
+ M_MODEM_TECH_NR = 1 << 6,
+ };
  ModemTechnology current_network_mode_;
  int preferred_network_mode_;
  int modem_radio_capability_;

staging/host/commands/modem_simulator/nvram_config.cpp

@@ -23,7 +23,6 @@
 
 #include "common/libs/utils/files.h"
 #include "host/commands/modem_simulator/device_config.h"
-#include "host/commands/modem_simulator/network_service.h"
 
 namespace cuttlefish {
 
@@ -35,7 +34,7 @@ static constexpr char kPreferredNetworkMode[] = "preferred_network_mode";
 static constexpr char kEmergencyMode[] = "emergency_mode";
 
 static constexpr int kDefaultNetworkSelectionMode = 0; // AUTOMATIC
-static constexpr int kDefaultModemTechnoloy = NetworkService::M_MODEM_TECH_LTE;
+static constexpr int kDefaultModemTechnoloy = 0x10; // LTE
 static constexpr int kDefaultPreferredNetworkMode = 0x13; // LTE | WCDMA | GSM
 static constexpr bool kDefaultEmergencyMode = false;