[Catalyst] Add SatelliteRepository.isSatelliteOn helper method

NO_IFTTT=Catalyst only

Bug: 335132588
Flag: EXEMPT refactor
Test: manual
Change-Id: Ib10f7f616a6deed438a129da4b2cb927915bfcda
This commit is contained in:
Jacky Wang
2024-12-09 17:19:40 +08:00
parent f79173a664
commit 95719f21b3
4 changed files with 22 additions and 34 deletions

View File

@@ -26,13 +26,13 @@ import android.os.UserManager
import android.provider.Settings
import android.telephony.PhoneStateListener
import android.telephony.TelephonyManager
import android.util.Log
import androidx.annotation.DrawableRes
import androidx.preference.Preference
import com.android.settings.AirplaneModeEnabler
import com.android.settings.PreferenceRestrictionMixin
import com.android.settings.R
import com.android.settings.Utils
import com.android.settings.network.SatelliteRepository.Companion.isSatelliteOn
import com.android.settingslib.RestrictedSwitchPreference
import com.android.settingslib.datastore.AbstractKeyedDataObservable
import com.android.settingslib.datastore.DataChangeReason
@@ -45,8 +45,6 @@ import com.android.settingslib.metadata.PreferenceLifecycleProvider
import com.android.settingslib.metadata.ReadWritePermit
import com.android.settingslib.metadata.SensitivityLevel
import com.android.settingslib.metadata.SwitchPreference
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
// LINT.IfChange
class AirplaneModePreference :
@@ -113,9 +111,7 @@ class AirplaneModePreference :
context.getSystemService(TelephonyManager::class.java)?.let {
phoneStateListener =
object : PhoneStateListener(Looper.getMainLooper()) {
@Deprecated("Deprecated in Java")
override fun onRadioPowerStateChanged(state: Int) {
Log.d(TAG, "onRadioPowerStateChanged(), state=$state")
notifyChange(KEY, DataChangeReason.UPDATE)
}
}
@@ -163,17 +159,6 @@ class AirplaneModePreference :
context.getSystemService(TelephonyManager::class.java),
)
private fun isSatelliteOn(context: Context): Boolean {
try {
return SatelliteRepository(context)
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS)
} catch (e: Exception) {
Log.e(TAG, "Error to get satellite status : $e")
}
return false
}
private fun showEcmDialog(context: PreferenceLifecycleContext) {
val intent =
Intent(TelephonyManager.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null)
@@ -192,7 +177,6 @@ class AirplaneModePreference :
}
companion object {
const val TAG = "AirplaneModePreference"
const val KEY = Settings.Global.AIRPLANE_MODE_ON
const val DEFAULT_VALUE = false
const val REQUEST_CODE_EXIT_ECM = 1