From 8f7a1e6f53050b86e5a55f20963a884b3f1fd500 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 14 Aug 2023 12:29:02 -0700 Subject: [PATCH] Fix kotlin nullable errors in Settings Fix kotlin nullable errors that were exposed by setting the retention of android.annotation.NonNull and android.annotation.Nullable to class retention. Bug: 294110802 Test: builds Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 (cherry picked from commit 84f8961e67d073bea2a1c146a219ff56fbfcf4fd) --- src/com/android/settings/RegulatoryInfoDisplayActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()