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
This commit is contained in:
@@ -46,7 +46,7 @@ class RegulatoryInfoDisplayActivity : Activity() {
|
|||||||
|
|
||||||
getRegulatoryInfo()?.let {
|
getRegulatoryInfo()?.let {
|
||||||
val view = layoutInflater.inflate(R.layout.regulatory_info, null)
|
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)
|
image.setImageDrawable(it)
|
||||||
builder.setView(view)
|
builder.setView(view)
|
||||||
builder.show()
|
builder.show()
|
||||||
|
@@ -106,8 +106,8 @@ class FingerprintSettingsRenameDialog : InstrumentedDialogFragment() {
|
|||||||
val dialog = FingerprintSettingsRenameDialog()
|
val dialog = FingerprintSettingsRenameDialog()
|
||||||
val onClick =
|
val onClick =
|
||||||
DialogInterface.OnClickListener { _, _ ->
|
DialogInterface.OnClickListener { _, _ ->
|
||||||
val dialogTextField =
|
val dialogTextField = dialog.requireDialog()
|
||||||
dialog.requireDialog().findViewById(R.id.fingerprint_rename_field) as ImeAwareEditText
|
.requireViewById(R.id.fingerprint_rename_field) as ImeAwareEditText
|
||||||
val newName = dialogTextField.text.toString()
|
val newName = dialogTextField.text.toString()
|
||||||
if (!TextUtils.equals(newName, fp.name)) {
|
if (!TextUtils.equals(newName, fp.name)) {
|
||||||
Log.d(TAG, "rename $fp.name to $newName for $dialog")
|
Log.d(TAG, "rename $fp.name to $newName for $dialog")
|
||||||
|
@@ -95,10 +95,10 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
|
|||||||
WindowManager.LayoutParams.FLAG_SECURE
|
WindowManager.LayoutParams.FLAG_SECURE
|
||||||
)
|
)
|
||||||
dialog.setCanceledOnTouchOutside(false)
|
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)
|
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))
|
qrCodeView.setImageBitmap(getEidQrCode(eid))
|
||||||
|
|
||||||
// After "Tap to show", eid is displayed on preference.
|
// After "Tap to show", eid is displayed on preference.
|
||||||
|
@@ -81,7 +81,7 @@ class FullScreenIntentPermissionPreferenceController(
|
|||||||
private fun isPermissionRequested(): Boolean {
|
private fun isPermissionRequested(): Boolean {
|
||||||
val packageInfo = packageManager.getPackageInfo(packageName, GET_PERMISSIONS)
|
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)) {
|
if (USE_FULL_SCREEN_INTENT.equals(requestedPermission)) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -115,4 +115,4 @@ class FullScreenIntentPermissionPreferenceController(
|
|||||||
const val KEY_FSI_PERMISSION = "fsi_permission"
|
const val KEY_FSI_PERMISSION = "fsi_permission"
|
||||||
const val TAG = "FsiPermPrefController"
|
const val TAG = "FsiPermPrefController"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -45,7 +45,7 @@ private class AppButtonsPresenter(private val packageInfoPresenter: PackageInfoP
|
|||||||
@Composable
|
@Composable
|
||||||
fun getActionButtons() =
|
fun getActionButtons() =
|
||||||
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
|
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
|
||||||
getActionButtons(it.applicationInfo)
|
getActionButtons(checkNotNull(it.applicationInfo))
|
||||||
} ?: emptyList()
|
} ?: emptyList()
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
@@ -118,7 +118,7 @@ object AppInfoSettingsProvider : SettingsPageProvider {
|
|||||||
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
|
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
|
||||||
LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })
|
LifecycleEffect(onStart = { packageInfoPresenter.reloadPackageInfo() })
|
||||||
val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return
|
val packageInfo = packageInfoPresenter.flow.collectAsStateWithLifecycle().value ?: return
|
||||||
val app = packageInfo.applicationInfo
|
val app = checkNotNull(packageInfo.applicationInfo)
|
||||||
RegularScaffold(
|
RegularScaffold(
|
||||||
title = stringResource(R.string.application_info_label),
|
title = stringResource(R.string.application_info_label),
|
||||||
actions = {
|
actions = {
|
||||||
|
@@ -41,7 +41,7 @@ private class CloneAppButtonsPresenter(private val packageInfoPresenter: Package
|
|||||||
@Composable
|
@Composable
|
||||||
fun getActionButtons() =
|
fun getActionButtons() =
|
||||||
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
|
packageInfoPresenter.flow.collectAsStateWithLifecycle(initialValue = null).value?.let {
|
||||||
getActionButtons(it.applicationInfo)
|
getActionButtons(checkNotNull(it.applicationInfo))
|
||||||
} ?: emptyList()
|
} ?: emptyList()
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
@@ -77,7 +77,7 @@ class PackageInfoPresenter(
|
|||||||
DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent ->
|
DisposableBroadcastReceiverAsUser(intentFilter, userHandle) { intent ->
|
||||||
if (packageName == intent.data?.schemeSpecificPart) {
|
if (packageName == intent.data?.schemeSpecificPart) {
|
||||||
val packageInfo = flow.value
|
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.
|
// System app still exists after uninstalling the updates, refresh the page.
|
||||||
reloadPackageInfo()
|
reloadPackageInfo()
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user