diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt index ffacb9c192a..fdf66c36b2b 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.kt +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.kt @@ -46,7 +46,7 @@ class RegulatoryInfoDisplayActivity : Activity() { getRegulatoryInfo()?.let { val view = layoutInflater.inflate(R.layout.regulatory_info, null) - val image = view.findViewById(R.id.regulatoryInfo) + val image = view.requireViewById(R.id.regulatoryInfo) image.setImageDrawable(it) builder.setView(view) builder.show() diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/fragment/FingerprintSettingsRenameDialog.kt b/src/com/android/settings/biometrics/fingerprint2/ui/fragment/FingerprintSettingsRenameDialog.kt index a08b3db5b75..9542ed83371 100644 --- a/src/com/android/settings/biometrics/fingerprint2/ui/fragment/FingerprintSettingsRenameDialog.kt +++ b/src/com/android/settings/biometrics/fingerprint2/ui/fragment/FingerprintSettingsRenameDialog.kt @@ -106,8 +106,8 @@ class FingerprintSettingsRenameDialog : InstrumentedDialogFragment() { val dialog = FingerprintSettingsRenameDialog() val onClick = DialogInterface.OnClickListener { _, _ -> - val dialogTextField = - dialog.requireDialog().findViewById(R.id.fingerprint_rename_field) as ImeAwareEditText + val dialogTextField = dialog.requireDialog() + .requireViewById(R.id.fingerprint_rename_field) as ImeAwareEditText val newName = dialogTextField.text.toString() if (!TextUtils.equals(newName, fp.name)) { Log.d(TAG, "rename $fp.name to $newName for $dialog") diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt index 7b27637c643..d1b37994679 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt @@ -205,8 +205,8 @@ class FingerprintEnrollIntroFragment : Fragment() { private fun getDescriptionDisabledByAdmin(context: Context): String? { val defaultStrId: Int = R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled - val devicePolicyManager: DevicePolicyManager = requireActivity() - .getSystemService(DevicePolicyManager::class.java) + val devicePolicyManager: DevicePolicyManager = + checkNotNull(requireActivity().getSystemService(DevicePolicyManager::class.java)) return devicePolicyManager.resources.getString(FINGERPRINT_UNLOCK_DISABLED) { context.getString(defaultStrId) @@ -234,7 +234,7 @@ class FingerprintEnrollIntroFragment : Fragment() { else View.INVISIBLE - view!!.findViewById(R.id.error_text).let { + view!!.requireViewById(R.id.error_text).let { when (status.enrollableStatus) { FINGERPRINT_ENROLLABLE_OK -> { it.text = null diff --git a/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt b/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt index e9380f5e6a4..4d1b90bb827 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt +++ b/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt @@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) : WindowManager.LayoutParams.FLAG_SECURE ) dialog.setCanceledOnTouchOutside(false) - val textView = dialog.findViewById(R.id.esim_id_value) + val textView = dialog.requireViewById(R.id.esim_id_value) textView.text = PhoneNumberUtil.expandByTts(eid) - val qrCodeView = dialog.findViewById(R.id.esim_id_qrcode) + val qrCodeView = dialog.requireViewById(R.id.esim_id_qrcode) qrCodeView.setImageBitmap(getEidQrCode(eid)) // After "Tap to show", eid is displayed on preference. diff --git a/src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt b/src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt index ec997498bfe..2cc26f680bd 100644 --- a/src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt +++ b/src/com/android/settings/notification/app/FullScreenIntentPermissionPreferenceController.kt @@ -81,7 +81,7 @@ class FullScreenIntentPermissionPreferenceController( private fun isPermissionRequested(): Boolean { val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS) - for (requestedPermission in packageInfo.requestedPermissions) { + for (requestedPermission in packageInfo.requestedPermissions.orEmpty()) { if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) { return true } @@ -115,4 +115,4 @@ class FullScreenIntentPermissionPreferenceController( const val KEY_FSI_PERMISSION = "fsi_permission" const val TAG = "FsiPermPrefController" } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/RemoteAuthEnrollBase.kt b/src/com/android/settings/remoteauth/RemoteAuthEnrollBase.kt index e00faece509..05be7ad8e98 100644 --- a/src/com/android/settings/remoteauth/RemoteAuthEnrollBase.kt +++ b/src/com/android/settings/remoteauth/RemoteAuthEnrollBase.kt @@ -65,7 +65,7 @@ abstract class RemoteAuthEnrollBase( abstract fun initializeSecondaryFooterButton(): FooterButton? private fun initializeFooterbarMixin(view: View) { - val footerBarMixin = getGlifLayout(view).getMixin(FooterBarMixin::class.java) + val footerBarMixin = checkNotNull(getGlifLayout(view)).getMixin(FooterBarMixin::class.java) primaryFooterButton.also { footerBarMixin.primaryButton = it } secondaryFooterButton?.also { footerBarMixin.secondaryButton = it } footerBarMixin.getButtonContainer().setBackgroundColor(getBackgroundColor()) @@ -80,4 +80,4 @@ abstract class RemoteAuthEnrollBase( private companion object{ const val TAG = "RemoteAuthEnrollBase" } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt b/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt index ffc683ee4ee..ad857635da9 100644 --- a/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt +++ b/src/com/android/settings/remoteauth/introduction/IntroductionImageCarousel.kt @@ -38,13 +38,15 @@ import com.android.settings.R import com.android.settingslib.widget.LottieColorUtils class IntroductionImageCarousel : ConstraintLayout { - private val carousel: ViewPager2 by lazy { findViewById(R.id.image_carousel) } + private val carousel: ViewPager2 by lazy { requireViewById(R.id.image_carousel) } private val progressIndicator: RecyclerView by lazy { - findViewById(R.id.carousel_progress_indicator) + requireViewById(R.id.carousel_progress_indicator) + } + private val backArrow: ImageView by lazy { + requireViewById(R.id.carousel_back_arrow) } - private val backArrow: ImageView by lazy { findViewById(R.id.carousel_back_arrow) } private val forwardArrow: ImageView by lazy { - findViewById(R.id.carousel_forward_arrow) + requireViewById(R.id.carousel_forward_arrow) } private val progressIndicatorAdapter = ProgressIndicatorAdapter() // The index of the current animation we are on @@ -156,4 +158,4 @@ class IntroductionImageCarousel : ConstraintLayout { ) const val TAG = "RemoteAuthCarousel" } -} \ No newline at end of file +} diff --git a/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt b/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt index f0de88e19d2..268d5f3924a 100644 --- a/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt +++ b/src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt @@ -71,7 +71,7 @@ class RemoteAuthEnrollIntroduction : } private fun initializeRequireScrollMixin(view: View) { - val layout = getGlifLayout(view) + val layout = checkNotNull(getGlifLayout(view)) secondaryFooterButton?.visibility = View.INVISIBLE val requireScrollMixin = layout.getMixin(RequireScrollMixin::class.java) requireScrollMixin.requireScrollWithButton(requireContext(), primaryFooterButton, @@ -89,4 +89,4 @@ class RemoteAuthEnrollIntroduction : private companion object { const val TAG = "RemoteAuthEnrollIntro" } -} \ No newline at end of file +} diff --git a/src/com/android/settings/spa/app/appinfo/AppButtons.kt b/src/com/android/settings/spa/app/appinfo/AppButtons.kt index 2e9d94514db..3200b81934b 100644 --- a/src/com/android/settings/spa/app/appinfo/AppButtons.kt +++ b/src/com/android/settings/spa/app/appinfo/AppButtons.kt @@ -45,7 +45,7 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP @Composable fun getActionButtons() = packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { - getActionButtons(it.applicationInfo) + getActionButtons(checkNotNull(it.applicationInfo)) } ?: emptyList() @Composable diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt index c38d6cf498f..a9d16ae26a5 100644 --- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt +++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt @@ -118,7 +118,7 @@ object AppInfoSettingsProvider : SettingsPageProvider { private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) { LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() }) val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return - val app = packageInfo.applicationInfo + val app = checkNotNull(packageInfo.applicationInfo) RegularScaffold( title = stringResource(R.string.application_info_label), actions = { diff --git a/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt b/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt index 0603f2ac93d..ddc7e178bf7 100644 --- a/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt +++ b/src/com/android/settings/spa/app/appinfo/ClonePageAppButtons.kt @@ -41,7 +41,7 @@ private class CloneAppButtonsPresenter(private val packageInfoPresenter: Package @Composable fun getActionButtons() = packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let { - getActionButtons(it.applicationInfo) + getActionButtons(checkNotNull(it.applicationInfo)) } ?: emptyList() @Composable diff --git a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt index 099a274d478..98a3e664855 100644 --- a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt +++ b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt @@ -77,7 +77,7 @@ class PackageInfoPresenter( DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent -> if (packageName == intent.data?.schemeSpecificPart) { val packageInfo = flow.value - if (packageInfo != null && packageInfo.applicationInfo.isSystemApp) { + if (packageInfo != null && packageInfo.applicationInfo?.isSystemApp == true) { // System app still exists after uninstalling the updates, refresh the page. reloadPackageInfo() } else {