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

Show dialog on Wifi, and APM' entries in Settings

Browse Source 
- When satellite mode is switched on Wifi, and APM entry shall show the warning dialog and avoid user uses these functions.

Bug: 337154438
Test: Manual test.
Test: atest pass
Change-Id: I45cd92a8688e7a619613361ea4a8d58a0984d99f
This commit is contained in:
tomhsu
2024-05-06 11:37:46 +00:00
committed by Tom Hsu
parent 412739469c
commit 29b2f16edf
6 changed files with 142 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.NetworkProviderSettings;
import com.android.settings.network.SatelliteRepository;
import com.android.settings.network.WifiSwitchPreferenceController;
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
@@ -66,6 +67,10 @@ import com.android.wifitrackerlib.WifiEntry;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
/**
@@ -225,7 +230,8 @@ public class WifiSlice implements CustomSliceable {
.setAccentColor(COLOR_NOT_TINTED)
.setKeywords(getKeywords())
.addRow(getHeaderRow(isWifiEnabled, wifiSliceItem));
if (!isWiFiPermissionGranted || !mWifiRestriction.isChangeWifiStateAllowed(mContext)) {
if (!isWiFiPermissionGranted || !mWifiRestriction.isChangeWifiStateAllowed(mContext)
|| isSatelliteOn()) {
return builder;
}
@@ -416,4 +422,17 @@ public class WifiSlice implements CustomSliceable {
return WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(context);
}
}
private boolean isSatelliteOn() {
SatelliteRepository satelliteRepository = new SatelliteRepository(mContext);
boolean isSatelliteOn = false;
try {
isSatelliteOn =
satelliteRepository.requestIsEnabled(Executors.newSingleThreadExecutor())
.get(2000, TimeUnit.MILLISECONDS);
} catch (ExecutionException | TimeoutException | InterruptedException e) {
Log.e(TAG, "Error to get satellite status : " + e);
}
return isSatelliteOn;
}
}