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

Commit 502ad4aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemServer: reduce callback visibility" into main am: 4a50b9b2 

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



Change-Id: Ie11537b904faa57ec92bd86f09601f087bc0b743
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efc9968f 4a50b9b2

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -398,6 +398,7 @@ class BluetoothManagerService { 
    private static final Object ON_SATELLITE_MODE_CHANGED_TOKEN = new Object();

    private static final Object ON_SATELLITE_MODE_CHANGED_TOKEN = new Object();

    private static final Object ON_SWITCH_USER_TOKEN = new Object();

    private static final Object ON_SWITCH_USER_TOKEN = new Object();





    @VisibleForTesting

    Unit onAirplaneModeChanged(boolean isAirplaneModeOn) {

    Unit onAirplaneModeChanged(boolean isAirplaneModeOn) {

        delayModeChangedIfNeeded(

        delayModeChangedIfNeeded(

                ON_AIRPLANE_MODE_CHANGED_TOKEN,

                ON_AIRPLANE_MODE_CHANGED_TOKEN,
@@ -406,8 +407,7 @@ class BluetoothManagerService { 
        return Unit.INSTANCE;

        return Unit.INSTANCE;

    }

    }





    // TODO(b/289584302): Update to private once use_new_satellite_mode is enabled

    private Unit onSatelliteModeChanged(boolean isSatelliteModeOn) {

    Unit onSatelliteModeChanged(boolean isSatelliteModeOn) {

        delayModeChangedIfNeeded(

        delayModeChangedIfNeeded(

                ON_SATELLITE_MODE_CHANGED_TOKEN,

                ON_SATELLITE_MODE_CHANGED_TOKEN,

                () -> handleSatelliteModeChanged(isSatelliteModeOn),

                () -> handleSatelliteModeChanged(isSatelliteModeOn),