diff --git a/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt index 907bab1217c..1e635a587fe 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt @@ -84,6 +84,13 @@ open class MobileNetworkEidPreferenceController(context: Context, key: String) : } override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { + if (!this::lazyViewModel.isInitialized) { + Log.e( + this.javaClass.simpleName, + "lateinit property lazyViewModel has not been initialized" + ) + return + } preference.isVisible = false val viewModel by lazyViewModel diff --git a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt index 8ec313b0483..e1346819f7d 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt @@ -78,6 +78,13 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) : } override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { + if (!this::lazyViewModel.isInitialized) { + Log.e( + this.javaClass.simpleName, + "lateinit property lazyViewModel has not been initialized" + ) + return + } val viewModel by lazyViewModel val coroutineScope = viewLifecycleOwner.lifecycleScope diff --git a/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt index 65a4b7e6dce..10a8b53e5d4 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt @@ -19,6 +19,7 @@ package com.android.settings.network.telephony import android.content.Context import android.telephony.SubscriptionInfo import android.telephony.SubscriptionManager +import android.util.Log import androidx.annotation.VisibleForTesting import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels @@ -66,6 +67,13 @@ class MobileNetworkPhoneNumberPreferenceController(context: Context, key: String } override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { + if (!this::lazyViewModel.isInitialized) { + Log.e( + this.javaClass.simpleName, + "lateinit property lazyViewModel has not been initialized" + ) + return + } val viewModel by lazyViewModel val coroutineScope = viewLifecycleOwner.lifecycleScope diff --git a/src/com/android/settings/network/telephony/MobileNetworkSpnPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkSpnPreferenceController.kt index ac055b02f06..4736eb7df83 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSpnPreferenceController.kt +++ b/src/com/android/settings/network/telephony/MobileNetworkSpnPreferenceController.kt @@ -19,6 +19,7 @@ package com.android.settings.network.telephony import android.content.Context import android.telephony.SubscriptionInfo import android.telephony.SubscriptionManager +import android.util.Log import androidx.annotation.VisibleForTesting import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels @@ -26,6 +27,7 @@ import androidx.lifecycle.LifecycleOwner import androidx.preference.Preference import androidx.preference.PreferenceScreen import com.android.settings.flags.Flags +import com.android.settings.network.SimOnboardingActivity import com.android.settings.network.SubscriptionInfoListViewModel import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle @@ -57,6 +59,14 @@ class MobileNetworkSpnPreferenceController(context: Context, key: String) : } override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { + if (!this::lazyViewModel.isInitialized) { + Log.e( + this.javaClass.simpleName, + "lateinit property lazyViewModel has not been initialized" + ) + return + } + val viewModel by lazyViewModel viewModel.subscriptionInfoListFlow diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt index 0ee1d87cd62..f184092821e 100644 --- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt +++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt @@ -22,6 +22,7 @@ import android.telecom.TelecomManager import android.telephony.SubscriptionManager import android.telephony.TelephonyManager import android.telephony.ims.ImsMmTelManager +import android.util.Log import androidx.lifecycle.LifecycleOwner import androidx.preference.Preference import androidx.preference.PreferenceScreen @@ -76,6 +77,13 @@ open class WifiCallingPreferenceController @JvmOverloads constructor( } override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) { + if(mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID){ + Log.e( + this.javaClass.simpleName, + "mSubId is INVALID_SUBSCRIPTION_ID" + ) + return + } wifiCallingRepositoryFactory(mSubId).wifiCallingReadyFlow() .collectLatestWithLifecycle(viewLifecycleOwner) { isReady -> preference.isVisible = isReady diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt index d709574997a..67a23563727 100644 --- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt +++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt @@ -23,6 +23,7 @@ import android.os.PersistableBundle import android.provider.Settings import android.telephony.CarrierConfigManager import android.telephony.ServiceState +import android.telephony.SubscriptionManager import android.telephony.TelephonyManager import androidx.annotation.VisibleForTesting import androidx.compose.runtime.Composable @@ -80,7 +81,7 @@ class AutoSelectPreferenceController @JvmOverloads constructor( @VisibleForTesting var progressDialog: ProgressDialog? = null - private var subId by notNull() + private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID /** * Initialization based on given subscription id.