PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e35f0679e3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I119564fb748f9fc4f8b0bf533a3fe988bdfb7165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Tuttle
2023-04-28 19:19:15 +00:00
committed by Automerger Merge Worker
parent 4693fb2f9d e35f0679e3
commit a4877c4410
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
View File

@@ -123,8 +123,8 @@ class SpaLogData(val id: String, val event: LogEvent,
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 ""
}
}

2
src/com/android/settings/spa/network/AirplaneModePreference.kt
View File

@@ -52,7 +52,7 @@ fun AirplaneModePreference() {
}
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