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

Commit 879f47bb authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "SystemServer: Improve satellite logs" into main am: 54f7e54c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2820997



Change-Id: I526aac90171256c5160af1a3db6ea41c16a13a53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 136f4c7d 54f7e54c

service/src/satellite/ModeListener.kt

+11 −11
Original line number Diff line number Diff line
@@ -43,7 +43,12 @@ public var isOn = false 


/** Listen on satellite mode and trigger the callback if it has changed */

public fun initialize(looper: Looper, resolver: ContentResolver, callback: (m: Boolean) -> Unit) {

    val satellite_callback =

    isOn =

        initializeRadioModeListener(

            looper,

            resolver,

            SETTINGS_SATELLITE_MODE_RADIOS,

            SETTINGS_SATELLITE_MODE_ENABLED,

            fun(newMode: Boolean) {

                val previousMode = isOn

                isOn = newMode
@@ -51,14 +56,9 @@ public fun initialize(looper: Looper, resolver: ContentResolver, callback: (m: B 
                    Log.d(TAG, "Ignore satellite mode change because is already: " + isOn)

                    return

                }

                Log.i(TAG, "Trigger callback with state: $isOn")

                callback(isOn)

            }

    isOn =

        initializeRadioModeListener(

            looper,

            resolver,

            SETTINGS_SATELLITE_MODE_RADIOS,

            SETTINGS_SATELLITE_MODE_ENABLED,

            satellite_callback

        )

    Log.i(TAG, "Initialized successfully with state: $isOn")

}

service/src/satellite/ModeListenerTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.ContentResolver 
import android.content.Context

import android.os.Looper

import android.provider.Settings

import android.util.Log

import androidx.test.core.app.ApplicationProvider

import com.android.server.bluetooth.satellite.SETTINGS_SATELLITE_MODE_ENABLED

import com.android.server.bluetooth.satellite.SETTINGS_SATELLITE_MODE_RADIOS
@@ -30,7 +31,9 @@ import com.android.server.bluetooth.test.enableMode 
import com.android.server.bluetooth.test.enableSensitive

import com.google.common.truth.Truth.assertThat

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.rules.TestName

import org.junit.runner.RunWith

import org.mockito.Mockito.times

import org.robolectric.RobolectricTestRunner
@@ -39,6 +42,7 @@ import org.robolectric.RobolectricTestRunner 
class ModeListenerTest {

    private val resolver: ContentResolver =

        ApplicationProvider.getApplicationContext<Context>().getContentResolver()

    @JvmField @Rule val testName = TestName()



    private val looper: Looper = Looper.getMainLooper()
@@ -46,6 +50,8 @@ class ModeListenerTest { 


    @Before

    public fun setup() {

        Log.i("SatelliteModeListener", "-------------------------------------------------------")

        Log.i("SatelliteModeListener", "--> Start of test: " + testName.getMethodName())

        mode = ArrayList()

    }