Merge "Check P2P channel before requesting network info" into udc-qpr-dev (dc98948c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,9 @@ public class WifiP2pSettings extends DashboardFragment
		}

		private void onDeviceAvailable() {
		if (mWifiP2pManager == null \|\| sChannel == null) {
		return;
		}
		mWifiP2pManager.requestNetworkInfo(sChannel, networkInfo -> {
		if (sChannel == null) return;
		mWifiP2pManager.requestConnectionInfo(sChannel, wifip2pinfo -> {

+8 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		@@ -150,6 +151,13 @@ public class WifiP2pSettingsTest {
		verify(mWifiP2pManager, times(1)).requestNetworkInfo(any(), any());
		}

		@Test
		public void onDeviceInfoAvailable_nullChannel_shouldBeIgnored() {
		mFragment.sChannel = null;
		mFragment.onDeviceInfoAvailable(mock(WifiP2pDevice.class));
		verify(mWifiP2pManager, never()).requestNetworkInfo(any(), any());
		}

		@Test
		public void beSearching_getP2pStateDisabledIntent_shouldBeFalse() {
		final Bundle bundle = new Bundle();