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

Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev am: d3946b5479 am: a2027e5960 am: b616ab6e6d am: 972c2fac45

Browse Source 
Change-Id: I2a799987a4903e1b287cecac2285081ea1ebb262
This commit is contained in:
Automerger Merge Worker
2020-03-04 12:03:08 +00:00
parent be527a0049 972c2fac45
commit 0e0a503aba
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
public boolean filterApp(AppEntry info) {
if (info == null || info.extraInfo == null) {
if (info == null || info.extraInfo == null
|| !(info.extraInfo instanceof WifiSettingsState)) {
return false;
}
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.content.pm.PackageInfo;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -81,4 +82,11 @@ public class AppStateChangeWifiStateBridgeTest {
mEntry.extraInfo = mState;
assertThat(mFilter.filterApp(mEntry)).isFalse();
}
@Test
public void testFilterApp_filterWrongTypeExtraInfo_returnFalse() {
mEntry.extraInfo = mock(DataUsageState.class);
assertThat(mFilter.filterApp(mEntry)).isFalse();
}
}