@Keep all the things in TestAccessPointBuilder

The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.

Bug: 33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I22b7e9fa54fcd67e0f754aca47907d87db9d7056
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
This commit is contained in:
Antony Sargent
2017-07-18 15:28:46 -07:00
parent df6486e37f
commit 08be449368

View File

@@ -22,6 +22,7 @@ import android.net.NetworkInfo;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.os.Bundle;
import android.support.annotation.Keep;
/**
* Build and return a valid AccessPoint.
@@ -30,6 +31,7 @@ import android.os.Bundle;
* applications. AccessPoints were designed to only be populated by the mechanisms of scan results
* and wifi configurations.
*/
@Keep
public class TestAccessPointBuilder {
// match the private values in WifiManager
private static final int MIN_RSSI = -100;
@@ -49,10 +51,12 @@ public class TestAccessPointBuilder {
Context mContext;
@Keep
public TestAccessPointBuilder(Context context) {
mContext = context;
}
@Keep
public AccessPoint build() {
Bundle bundle = new Bundle();
@@ -77,6 +81,7 @@ public class TestAccessPointBuilder {
return ap;
}
@Keep
public TestAccessPointBuilder setActive(boolean active) {
if (active) {
mNetworkInfo = new NetworkInfo(
@@ -96,6 +101,7 @@ public class TestAccessPointBuilder {
* <p>Side effect: if this AccessPoint was previously unreachable,
* setting the level will also make it reachable.
*/
@Keep
public TestAccessPointBuilder setLevel(int level) {
// Reversal of WifiManager.calculateSignalLevels
if (level == 0) {
@@ -110,11 +116,13 @@ public class TestAccessPointBuilder {
return this;
}
@Keep
public TestAccessPointBuilder setNetworkInfo(NetworkInfo info) {
mNetworkInfo = info;
return this;
}
@Keep
public TestAccessPointBuilder setRssi(int rssi) {
mRssi = rssi;
return this;
@@ -125,6 +133,7 @@ public class TestAccessPointBuilder {
* Side effect: if the signal level was not previously set,
* making an AccessPoint reachable will set the signal to the minimum level.
*/
@Keep
public TestAccessPointBuilder setReachable(boolean reachable) {
if (reachable) {
// only override the mRssi if it hasn't been set yet
@@ -137,6 +146,7 @@ public class TestAccessPointBuilder {
return this;
}
@Keep
public TestAccessPointBuilder setSaved(boolean saved){
if (saved) {
mNetworkId = 1;
@@ -146,26 +156,31 @@ public class TestAccessPointBuilder {
return this;
}
@Keep
public TestAccessPointBuilder setSecurity(int security) {
mSecurity = security;
return this;
}
@Keep
public TestAccessPointBuilder setSsid(String newSsid) {
ssid = newSsid;
return this;
}
@Keep
public TestAccessPointBuilder setFqdn(String fqdn) {
mFqdn = fqdn;
return this;
}
@Keep
public TestAccessPointBuilder setProviderFriendlyName(String friendlyName) {
mProviderFriendlyName = friendlyName;
return this;
}
@Keep
public TestAccessPointBuilder setWifiInfo(WifiInfo info) {
mWifiInfo = info;
return this;
@@ -177,6 +192,7 @@ public class TestAccessPointBuilder {
* <p>Setting this to a value other than {@link WifiConfiguration#INVALID_NETWORK_ID} makes this
* AccessPoint a saved network.
*/
@Keep
public TestAccessPointBuilder setNetworkId(int networkId) {
mNetworkId = networkId;
return this;