Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b3df1c0 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Fix a couple compiler warnings in Settings" into udc-dev

parents ec12caad 75f566bc

src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -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 ""

    }

}

src/com/android/settings/spa/network/AirplaneModePreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -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