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

Commit d5225c23 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Change API requestIsEnabled to requestIsSessionStarted" into main

parents 30b9c3c1 b0919956

src/com/android/settings/bluetooth/BluetoothEnabler.java

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh 


        new Thread(() -> {

            try {

                mIsSatelliteOn.set(mSatelliteRepository.requestIsEnabled(

                mIsSatelliteOn.set(mSatelliteRepository.requestIsSessionStarted(

                        Executors.newSingleThreadExecutor()).get(3000, TimeUnit.MILLISECONDS));

            } catch (InterruptedException | ExecutionException | TimeoutException e) {

                Log.e(TAG, "Error to get satellite status : " + e);

src/com/android/settings/network/AirplaneModePreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -162,7 +162,8 @@ public class AirplaneModePreferenceController extends TogglePreferenceController 
    public void onResume() {

        try {

            mIsSatelliteOn.set(

                    mSatelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())

                    mSatelliteRepository

                            .requestIsSessionStarted(Executors.newSingleThreadExecutor())

                            .get(2000, TimeUnit.MILLISECONDS));

        } catch (ExecutionException | TimeoutException | InterruptedException e) {

            Log.e(TAG, "Error to get satellite status : " + e);

src/com/android/settings/wifi/slice/WifiSlice.java

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class WifiSlice implements CustomSliceable { 
        boolean isSatelliteOn = false;

        try {

            isSatelliteOn =

                    satelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())

                    satelliteRepository.requestIsSessionStarted(Executors.newSingleThreadExecutor())

                            .get(2000, TimeUnit.MILLISECONDS);

        } catch (ExecutionException | TimeoutException | InterruptedException e) {

            Log.e(TAG, "Error to get satellite status : " + e);