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

Merge "[Passpointv2] Provide two views for saved networks"

Browse Source
This commit is contained in:
Clown SHEN
2019-03-08 02:42:30 +00:00
committed by Android (Google) Code Review
parent 470caabd50 0a7e2c0383
commit 457f9a6ee8
9 changed files with 422 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
View File

@@ -27,12 +27,15 @@ import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadow.api.Shadow;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Implements(value = WifiManager.class)
public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager {
private List<PasspointConfiguration> mPasspointConfiguration;
public WifiConfiguration savedWifiConfig;
private WifiConfiguration mSavedApConfig;
@@ -61,7 +64,15 @@ public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager
@Implementation
protected List<PasspointConfiguration> getPasspointConfigurations() {
return Collections.emptyList();
return mPasspointConfiguration == null ? Collections.emptyList() : mPasspointConfiguration;
}
@Implementation
protected void addOrUpdatePasspointConfiguration(PasspointConfiguration config) {
if (mPasspointConfiguration == null) {
mPasspointConfiguration = new ArrayList<>();
}
mPasspointConfiguration.add(config);
}
@Implementation