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

Fix exception when filtering the APPs which can CHANGE_WIFI_STATE

Browse Source 
When filtering AppEntry, only allow the extraInfo type of WifiSettingsState.

Bug: 148486719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppStateChangeWifiStateBridgeTest
Change-Id: I486e88629aec8cfecf6174de8987d37394043743
This commit is contained in:
Arc Wang
2020-03-04 16:09:41 +08:00
parent 4a76598ba5
commit d5bdbdb345
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
View File

@@ -83,7 +83,8 @@ public class AppStateChangeWifiStateBridge extends AppStateAppOpsBridge {
@Override @Override
public boolean filterApp(AppEntry info) { public boolean filterApp(AppEntry info) {
if (info == null || info.extraInfo == null) { if (info == null || info.extraInfo == null
|| !(info.extraInfo instanceof WifiSettingsState)) {
return false; return false;
} }
WifiSettingsState wifiSettingsState = (WifiSettingsState) info.extraInfo; WifiSettingsState wifiSettingsState = (WifiSettingsState) info.extraInfo;

8
tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
View File

@@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock;
import android.Manifest; import android.Manifest;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter; import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -81,4 +82,11 @@ public class AppStateChangeWifiStateBridgeTest {
mEntry.extraInfo = mState; mEntry.extraInfo = mState;
assertThat(mFilter.filterApp(mEntry)).isFalse(); assertThat(mFilter.filterApp(mEntry)).isFalse();
} }
@Test
public void testFilterApp_filterWrongTypeExtraInfo_returnFalse() {
mEntry.extraInfo = mock(DataUsageState.class);
assertThat(mFilter.filterApp(mEntry)).isFalse();
}
} }