Merge "Fix the settings crash" into main (8721efd9) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,13 @@ open class MobileNetworkEidPreferenceController(context: Context, key: String) :
	}		}

	override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {		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		preference.isVisible = false

	val viewModel by lazyViewModel		val viewModel by lazyViewModel

src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,13 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) :
	}		}

	override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {		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 viewModel by lazyViewModel
	val coroutineScope = viewLifecycleOwner.lifecycleScope		val coroutineScope = viewLifecycleOwner.lifecycleScope

src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.settings.network.telephony
	import android.content.Context		import android.content.Context
	import android.telephony.SubscriptionInfo		import android.telephony.SubscriptionInfo
	import android.telephony.SubscriptionManager		import android.telephony.SubscriptionManager
			import android.util.Log
	import androidx.annotation.VisibleForTesting		import androidx.annotation.VisibleForTesting
	import androidx.fragment.app.Fragment		import androidx.fragment.app.Fragment
	import androidx.fragment.app.viewModels		import androidx.fragment.app.viewModels
	@@ -66,6 +67,13 @@ class MobileNetworkPhoneNumberPreferenceController(context: Context, key: String
	}		}

	override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {		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 viewModel by lazyViewModel
	val coroutineScope = viewLifecycleOwner.lifecycleScope		val coroutineScope = viewLifecycleOwner.lifecycleScope

src/com/android/settings/network/telephony/MobileNetworkSpnPreferenceController.kt

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.settings.network.telephony
	import android.content.Context		import android.content.Context
	import android.telephony.SubscriptionInfo		import android.telephony.SubscriptionInfo
	import android.telephony.SubscriptionManager		import android.telephony.SubscriptionManager
			import android.util.Log
	import androidx.annotation.VisibleForTesting		import androidx.annotation.VisibleForTesting
	import androidx.fragment.app.Fragment		import androidx.fragment.app.Fragment
	import androidx.fragment.app.viewModels		import androidx.fragment.app.viewModels
	@@ -26,6 +27,7 @@ import androidx.lifecycle.LifecycleOwner
	import androidx.preference.Preference		import androidx.preference.Preference
	import androidx.preference.PreferenceScreen		import androidx.preference.PreferenceScreen
	import com.android.settings.flags.Flags		import com.android.settings.flags.Flags
			import com.android.settings.network.SimOnboardingActivity
	import com.android.settings.network.SubscriptionInfoListViewModel		import com.android.settings.network.SubscriptionInfoListViewModel
	import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle		import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle

	@@ -57,6 +59,14 @@ class MobileNetworkSpnPreferenceController(context: Context, key: String) :
	}		}

	override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {		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 viewModel by lazyViewModel

	viewModel.subscriptionInfoListFlow		viewModel.subscriptionInfoListFlow

src/com/android/settings/network/telephony/WifiCallingPreferenceController.kt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@ import android.telecom.TelecomManager
	import android.telephony.SubscriptionManager		import android.telephony.SubscriptionManager
	import android.telephony.TelephonyManager		import android.telephony.TelephonyManager
	import android.telephony.ims.ImsMmTelManager		import android.telephony.ims.ImsMmTelManager
			import android.util.Log
	import androidx.lifecycle.LifecycleOwner		import androidx.lifecycle.LifecycleOwner
	import androidx.preference.Preference		import androidx.preference.Preference
	import androidx.preference.PreferenceScreen		import androidx.preference.PreferenceScreen
	@@ -76,6 +77,13 @@ open class WifiCallingPreferenceController @JvmOverloads constructor(
	}		}

	override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {		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()		wifiCallingRepositoryFactory(mSubId).wifiCallingReadyFlow()
	.collectLatestWithLifecycle(viewLifecycleOwner) { isReady ->		.collectLatestWithLifecycle(viewLifecycleOwner) { isReady ->
	preference.isVisible = isReady		preference.isVisible = isReady