Merge "Revert "Keeps signal strength changing in modem simulator.""

2 files changed, 2 insertions, 43 deletions

diff --git a/host/commands/modem_simulator/network_service.cpp b/host/commands/modem_simulator/network_service.cpp
index 9d1500026..af9c59ef4 100644
--- a/host/commands/modem_simulator/network_service.cpp
+++ b/host/commands/modem_simulator/network_service.cpp
@@ -35,8 +35,7 @@ NetworkService::NetworkService(int32_t service_id,
                                ChannelMonitor* channel_monitor,
                                ThreadLooper* thread_looper)
     : ModemService(service_id, this->InitializeCommandHandlers(),
-                   channel_monitor, thread_looper),
-      keep_signal_strength_changing_loop_(this) {
+                   channel_monitor, thread_looper) {
   InitializeServiceState();
 }
 
@@ -994,7 +993,7 @@ void NetworkService::UpdateRegisterState(RegistrationState state ) {
 
   OnVoiceRegisterStateChanged();
   OnDataRegisterStateChanged();
-  keep_signal_strength_changing_loop_.Start();
+  OnSignalStrengthChanged();
 
   int cellBandwidthDownlink = 5000;
   const int UNKNOWN = 0;
@@ -1251,30 +1250,4 @@ void NetworkService::OnSignalStrengthChanged() {
 NetworkService::RegistrationState NetworkService::GetVoiceRegistrationState() const {
   return voice_registration_status_.registration_state;
 }
-
-NetworkService::KeepSignalStrengthChangingLoop::KeepSignalStrengthChangingLoop(
-    NetworkService* network_service)
-    : network_service_(network_service) {}
-
-void NetworkService::KeepSignalStrengthChangingLoop::Start() {
-  if (loop_started_.test_and_set()) {
-    LOG(ERROR) << "Signal strength is already changing automatically";
-  } else {
-    UpdateSignalStrengthCallback();
-  }
-}
-
-void NetworkService::KeepSignalStrengthChangingLoop::
-    UpdateSignalStrengthCallback() {
-  network_service_->signal_strength_percent_ -= 5;
-  if (network_service_->signal_strength_percent_ <= 0) {
-    network_service_->signal_strength_percent_ = 100;
-  }
-  network_service_->thread_looper_->Post(
-      makeSafeCallback(this, &NetworkService::KeepSignalStrengthChangingLoop::
-                                 UpdateSignalStrengthCallback),
-      std::chrono::seconds(10));
-  network_service_->OnSignalStrengthChanged();
-}
-
 }  // namespace cuttlefish
diff --git a/host/commands/modem_simulator/network_service.h b/host/commands/modem_simulator/network_service.h
index 83d50e4f5..68f0d5d00 100644
--- a/host/commands/modem_simulator/network_service.h
+++ b/host/commands/modem_simulator/network_service.h
@@ -288,20 +288,6 @@ class NetworkService : public ModemService, public std::enable_shared_from_this<
 
   bool first_signal_strength_request_;  // For time update
   time_t android_last_signal_time_;
-
-  class KeepSignalStrengthChangingLoop {
-   public:
-    KeepSignalStrengthChangingLoop(NetworkService* network_service);
-    void Start();
-
-   private:
-    void UpdateSignalStrengthCallback();
-
-    NetworkService* network_service_;
-    std::atomic_flag loop_started_;
-  };
-
-  KeepSignalStrengthChangingLoop keep_signal_strength_changing_loop_;
 };
 
 }  // namespace cuttlefish