Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused plumbing for connected PNO

Browse Source 
These are not actually used.

Bug: 142081306
Test: atest FrameworksWifiWifiTests

Change-Id: I51b32b446c3df04954355784c895487f0a96ee9b
This commit is contained in:
Michael Plass
2019-12-18 16:02:09 -08:00
parent df15522021
commit 98d8f071a4
2 changed files with 0 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wifi/java/android/net/wifi/WifiScanner.java
View File

@@ -742,21 +742,6 @@ public class WifiScanner {
public int min24GHzRssi;
/** Minimum 6GHz RSSI for a BSSID to be considered */
public int min6GHzRssi;
/** Maximum score that a network can have before bonuses */
public int initialScoreMax;
/**
* Only report when there is a network's score this much higher
* than the current connection.
*/
public int currentConnectionBonus;
/** score bonus for all networks with the same network flag */
public int sameNetworkBonus;
/** score bonus for networks that are not open */
public int secureBonus;
/** 5GHz RSSI score bonus (applied to all 5GHz networks) */
public int band5GHzBonus;
/** 6GHz RSSI score bonus (applied to all 5GHz networks) */
public int band6GHzBonus;
/** Pno Network filter list */
public PnoNetwork[] networkList;
@@ -771,12 +756,6 @@ public class WifiScanner {
dest.writeInt(min5GHzRssi);
dest.writeInt(min24GHzRssi);
dest.writeInt(min6GHzRssi);
dest.writeInt(initialScoreMax);
dest.writeInt(currentConnectionBonus);
dest.writeInt(sameNetworkBonus);
dest.writeInt(secureBonus);
dest.writeInt(band5GHzBonus);
dest.writeInt(band6GHzBonus);
if (networkList != null) {
dest.writeInt(networkList.length);
for (int i = 0; i < networkList.length; i++) {
@@ -799,12 +778,6 @@ public class WifiScanner {
settings.min5GHzRssi = in.readInt();
settings.min24GHzRssi = in.readInt();
settings.min6GHzRssi = in.readInt();
settings.initialScoreMax = in.readInt();
settings.currentConnectionBonus = in.readInt();
settings.sameNetworkBonus = in.readInt();
settings.secureBonus = in.readInt();
settings.band5GHzBonus = in.readInt();
settings.band6GHzBonus = in.readInt();
int numNetworks = in.readInt();
settings.networkList = new PnoNetwork[numNetworks];
for (int i = 0; i < numNetworks; i++) {

20
wifi/tests/src/android/net/wifi/WifiScannerTest.java
View File

@@ -80,12 +80,6 @@ public class WifiScannerTest {
private static final int TEST_PNOSETTINGS_MIN_5GHZ_RSSI = -60;
private static final int TEST_PNOSETTINGS_MIN_2GHZ_RSSI = -70;
private static final int TEST_PNOSETTINGS_MIN_6GHZ_RSSI = -55;
private static final int TEST_PNOSETTINGS_INITIAL_SCORE_MAX = 50;
private static final int TEST_PNOSETTINGS_CURRENT_CONNECTION_BONUS = 10;
private static final int TEST_PNOSETTINGS_SAME_NETWORK_BONUS = 11;
private static final int TEST_PNOSETTINGS_SECURE_BONUS = 12;
private static final int TEST_PNOSETTINGS_BAND_5GHZ_BONUS = 13;
private static final int TEST_PNOSETTINGS_BAND_6GHZ_BONUS = 15;
private static final String TEST_SSID_1 = "TEST1";
private static final String TEST_SSID_2 = "TEST2";
private static final int[] TEST_FREQUENCIES_1 = {};
@@ -186,12 +180,6 @@ public class WifiScannerTest {
pnoSettings.min5GHzRssi = TEST_PNOSETTINGS_MIN_5GHZ_RSSI;
pnoSettings.min24GHzRssi = TEST_PNOSETTINGS_MIN_2GHZ_RSSI;
pnoSettings.min6GHzRssi = TEST_PNOSETTINGS_MIN_6GHZ_RSSI;
pnoSettings.initialScoreMax = TEST_PNOSETTINGS_INITIAL_SCORE_MAX;
pnoSettings.currentConnectionBonus = TEST_PNOSETTINGS_CURRENT_CONNECTION_BONUS;
pnoSettings.sameNetworkBonus = TEST_PNOSETTINGS_SAME_NETWORK_BONUS;
pnoSettings.secureBonus = TEST_PNOSETTINGS_SECURE_BONUS;
pnoSettings.band5GHzBonus = TEST_PNOSETTINGS_BAND_5GHZ_BONUS;
pnoSettings.band6GHzBonus = TEST_PNOSETTINGS_BAND_6GHZ_BONUS;
Parcel parcel = Parcel.obtain();
pnoSettings.writeToParcel(parcel, 0);
@@ -205,14 +193,6 @@ public class WifiScannerTest {
assertEquals(TEST_PNOSETTINGS_MIN_5GHZ_RSSI, pnoSettingsDeserialized.min5GHzRssi);
assertEquals(TEST_PNOSETTINGS_MIN_2GHZ_RSSI, pnoSettingsDeserialized.min24GHzRssi);
assertEquals(TEST_PNOSETTINGS_MIN_6GHZ_RSSI, pnoSettingsDeserialized.min6GHzRssi);
assertEquals(TEST_PNOSETTINGS_INITIAL_SCORE_MAX, pnoSettingsDeserialized.initialScoreMax);
assertEquals(TEST_PNOSETTINGS_CURRENT_CONNECTION_BONUS,
pnoSettingsDeserialized.currentConnectionBonus);
assertEquals(TEST_PNOSETTINGS_SAME_NETWORK_BONUS,
pnoSettingsDeserialized.sameNetworkBonus);
assertEquals(TEST_PNOSETTINGS_SECURE_BONUS, pnoSettingsDeserialized.secureBonus);
assertEquals(TEST_PNOSETTINGS_BAND_5GHZ_BONUS, pnoSettingsDeserialized.band5GHzBonus);
assertEquals(TEST_PNOSETTINGS_BAND_6GHZ_BONUS, pnoSettingsDeserialized.band6GHzBonus);
// Test parsing of PnoNetwork
assertEquals(pnoSettings.networkList.length, pnoSettingsDeserialized.networkList.length);