From 413e85fa7a9d8d1352cd9864888678b5c6733e89 Mon Sep 17 00:00:00 2001
From: "Chaitanya Cheemala (xWF)" <ccheemala@google.com>
Date: Tue, 30 Jul 2024 09:31:35 +0000
Subject: [PATCH] Revert "Change API requestIsEnabled to
 requestIsSessionStarted"

Revert submission 28533501-NTN_check_modem_state

Reason for revert: Likely culprit for b/356320274  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:28533501-NTN_check_modem_state

Change-Id: I4cdb936eb6a27eeee0aba6a5adfcf9cbdfacd5eb
---
 src/com/android/settings/bluetooth/BluetoothEnabler.java       | 2 +-
 .../settings/network/AirplaneModePreferenceController.java     | 3 +--
 src/com/android/settings/wifi/slice/WifiSlice.java             | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index a5d0bc67769..df5cc72fae1 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -132,7 +132,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
 
         new Thread(() -> {
             try {
-                mIsSatelliteOn.set(mSatelliteRepository.requestIsSessionStarted(
+                mIsSatelliteOn.set(mSatelliteRepository.requestIsEnabled(
                         Executors.newSingleThreadExecutor()).get(3000, TimeUnit.MILLISECONDS));
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
                 Log.e(TAG, "Error to get satellite status : " + e);
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index d4bd4a369c0..b1f6e5052ff 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -162,8 +162,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
     public void onResume() {
         try {
             mIsSatelliteOn.set(
-                    mSatelliteRepository
-                            .requestIsSessionStarted(Executors.newSingleThreadExecutor())
+                    mSatelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())
                             .get(2000, TimeUnit.MILLISECONDS));
         } catch (ExecutionException | TimeoutException | InterruptedException e) {
             Log.e(TAG, "Error to get satellite status : " + e);
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index 3bb50d35817..ff448a86692 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -431,7 +431,7 @@ public class WifiSlice implements CustomSliceable {
         boolean isSatelliteOn = false;
         try {
             isSatelliteOn =
-                    satelliteRepository.requestIsSessionStarted(Executors.newSingleThreadExecutor())
+                    satelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())
                             .get(2000, TimeUnit.MILLISECONDS);
         } catch (ExecutionException | TimeoutException | InterruptedException e) {
             Log.e(TAG, "Error to get satellite status : " + e);