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

Fix robotests

Browse Source 
This is related to settings_network_and_internet_v2 flag turn on. Some
tests were assuming old flag behavior.

Fixes: 128356137
Test: robotests
Change-Id: I4eca49f24ad5a10a0fb40f2c02a2d139ba4cb1a4
This commit is contained in:
Fan Zhang
2019-03-12 11:00:09 -07:00
parent 40d8ac2968
commit 1ef08ae814
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -168,7 +168,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.network_and_internet;
if (FeatureFlagPersistent.isEnabled(context,
FeatureFlags.NETWORK_INTERNET_V2)) {
sir.xmlResId = R.xml.network_and_internet_v2;
} else {
sir.xmlResId = R.xml.network_and_internet;
}
return Arrays.asList(sir);
}