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

Merge "Revert "Change API requestIsEnabled to requestIsSessionStarted"" into main

Browse Source
This commit is contained in:
Priyanka Advani (xWF)
2024-07-30 18:12:18 +00:00
committed by Android (Google) Code Review
parent 2e12b95c45 413e85fa7a
commit 9bf8ce78b2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothEnabler.java
View File

@@ -132,7 +132,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
new Thread(() -> { new Thread(() -> {
try { try {
mIsSatelliteOn.set(mSatelliteRepository.requestIsSessionStarted( mIsSatelliteOn.set(mSatelliteRepository.requestIsEnabled(
Executors.newSingleThreadExecutor()).get(3000, TimeUnit.MILLISECONDS)); Executors.newSingleThreadExecutor()).get(3000, TimeUnit.MILLISECONDS));
} catch (InterruptedException | ExecutionException | TimeoutException e) { } catch (InterruptedException | ExecutionException | TimeoutException e) {
Log.e(TAG, "Error to get satellite status : " + e); Log.e(TAG, "Error to get satellite status : " + e);

3
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -162,8 +162,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
public void onResume() { public void onResume() {
try { try {
mIsSatelliteOn.set( mIsSatelliteOn.set(
mSatelliteRepository mSatelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())
.requestIsSessionStarted(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS)); .get(2000, TimeUnit.MILLISECONDS));
} catch (ExecutionException | TimeoutException | InterruptedException e) { } catch (ExecutionException | TimeoutException | InterruptedException e) {
Log.e(TAG, "Error to get satellite status : " + e); Log.e(TAG, "Error to get satellite status : " + e);

2
src/com/android/settings/wifi/slice/WifiSlice.java
View File

@@ -431,7 +431,7 @@ public class WifiSlice implements CustomSliceable {
boolean isSatelliteOn = false; boolean isSatelliteOn = false;
try { try {
isSatelliteOn = isSatelliteOn =
satelliteRepository.requestIsSessionStarted(Executors.newSingleThreadExecutor()) satelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS); .get(2000, TimeUnit.MILLISECONDS);
} catch (ExecutionException | TimeoutException | InterruptedException e) { } catch (ExecutionException | TimeoutException | InterruptedException e) {
Log.e(TAG, "Error to get satellite status : " + e); Log.e(TAG, "Error to get satellite status : " + e);