Merge "Fix kotlin nullable errors in Settings" into main (2fc7f23f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/RegulatoryInfoDisplayActivity.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ class RegulatoryInfoDisplayActivity : Activity() {

		getRegulatoryInfo()?.let {
		val view = layoutInflater.inflate(R.layout.regulatory_info, null)
		val image = view.findViewById<ImageView>(R.id.regulatoryInfo)
		val image = view.requireViewById<ImageView>(R.id.regulatoryInfo)
		image.setImageDrawable(it)
		builder.setView(view)
		builder.show()

+2 −2

Original line number	Diff line number	Diff line
		@@ -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")

+3 −3

Original line number	Diff line number	Diff line
		@@ -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<TextView>(R.id.error_text).let {
		view!!.requireViewById<TextView>(R.id.error_text).let {
		when (status.enrollableStatus) {
		FINGERPRINT_ENROLLABLE_OK -> {
		it.text = null

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
		WindowManager.LayoutParams.FLAG_SECURE
		)
		dialog.setCanceledOnTouchOutside(false)
		val textView = dialog.findViewById<TextView>(R.id.esim_id_value)
		val textView = dialog.requireViewById<TextView>(R.id.esim_id_value)
		textView.text = PhoneNumberUtil.expandByTts(eid)

		val qrCodeView = dialog.findViewById<ImageView>(R.id.esim_id_qrcode)
		val qrCodeView = dialog.requireViewById<ImageView>(R.id.esim_id_qrcode)
		qrCodeView.setImageBitmap(getEidQrCode(eid))

		// After "Tap to show", eid is displayed on preference.

+2 −2

Original line number	Diff line number	Diff line
		@@ -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
		}