Merge "Fix a couple compiler warnings in Settings" into udc-dev
diff --git a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
index 31d5797..600a2e6 100644
--- a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
+++ b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
@@ -123,8 +123,8 @@
return ElapsedTimeUtils.getElapsedTime(System.currentTimeMillis())
}
- //TODO(b/253979024): Will be implemented in subsequent CLs.
- private fun getPageIdByEntryId(id: String): String {
+ //TODO(b/253979024): Will be implemented in subsequent CLs. Remove @Suppress when done.
+ private fun getPageIdByEntryId(@Suppress("UNUSED_PARAMETER") id: String): String {
return ""
}
}
diff --git a/src/com/android/settings/spa/network/AirplaneModePreference.kt b/src/com/android/settings/spa/network/AirplaneModePreference.kt
index 4af3221..462c121 100644
--- a/src/com/android/settings/spa/network/AirplaneModePreference.kt
+++ b/src/com/android/settings/spa/network/AirplaneModePreference.kt
@@ -52,7 +52,7 @@
}
private class AirplaneModeController(private val context: Context) : OnAirplaneModeChangedListener {
- private var airplaneModeEnabler = AirplaneModeEnabler(context, this)!!
+ private var airplaneModeEnabler = AirplaneModeEnabler(context, this)
private val _airplaneModeState = MutableLiveData<Boolean>()
val airplaneModeState: LiveData<Boolean>
get() = _airplaneModeState