[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:
@@ -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
|
||||
|
||||
@@ -17,9 +17,12 @@ package com.android.settings.network
|
||||
|
||||
import android.content.Context
|
||||
import com.android.settings.R
|
||||
import com.android.settings.Settings.NetworkDashboardActivity
|
||||
import com.android.settings.datausage.DataSaverScreen
|
||||
import com.android.settings.flags.Flags
|
||||
import com.android.settings.utils.makeLaunchIntent
|
||||
import com.android.settingslib.metadata.PreferenceIconProvider
|
||||
import com.android.settingslib.metadata.PreferenceMetadata
|
||||
import com.android.settingslib.metadata.ProvidePreferenceScreen
|
||||
import com.android.settingslib.metadata.preferenceHierarchy
|
||||
import com.android.settingslib.preference.PreferenceScreenCreator
|
||||
@@ -44,6 +47,9 @@ class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {
|
||||
|
||||
override fun fragmentClass() = NetworkDashboardFragment::class.java
|
||||
|
||||
override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =
|
||||
makeLaunchIntent(context, NetworkDashboardActivity::class.java, metadata?.key)
|
||||
|
||||
override fun getPreferenceHierarchy(context: Context) =
|
||||
preferenceHierarchy(this) {
|
||||
+MobileNetworkListScreen.KEY order -15
|
||||
|
||||
@@ -26,6 +26,8 @@ import androidx.concurrent.futures.CallbackToFutureAdapter
|
||||
import com.google.common.util.concurrent.Futures.immediateFuture
|
||||
import com.google.common.util.concurrent.ListenableFuture
|
||||
import java.util.concurrent.Executor
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.asExecutor
|
||||
@@ -203,5 +205,15 @@ class SatelliteRepository(
|
||||
fun setIsSessionStartedForTesting(isEnabled: Boolean) {
|
||||
this.isSessionStarted = isEnabled
|
||||
}
|
||||
|
||||
fun isSatelliteOn(context: Context, timeoutMs: Long = 2000): Boolean =
|
||||
try {
|
||||
SatelliteRepository(context)
|
||||
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
|
||||
.get(timeoutMs, TimeUnit.MILLISECONDS)
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "Error to get satellite status : $e")
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user