Merge "Fix exception when filtering the APPs which can CHANGE_WIFI_STATE" into rvc-dev (d3946b54) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}