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

Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-30 15:36:49 +00:00
committed by Automerger Merge Worker
parent 0d1b67b73e dc98948cc1
commit fedd6b35a4
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -617,6 +617,9 @@ public class WifiP2pSettings extends DashboardFragment
} }
private void onDeviceAvailable() { private void onDeviceAvailable() {
if (mWifiP2pManager == null || sChannel == null) {
return;
}
mWifiP2pManager.requestNetworkInfo(sChannel, networkInfo -> { mWifiP2pManager.requestNetworkInfo(sChannel, networkInfo -> {
if (sChannel == null) return; if (sChannel == null) return;
mWifiP2pManager.requestConnectionInfo(sChannel, wifip2pinfo -> { mWifiP2pManager.requestConnectionInfo(sChannel, wifip2pinfo -> {

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

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -150,6 +151,13 @@ public class WifiP2pSettingsTest {
verify(mWifiP2pManager, times(1)).requestNetworkInfo(any(), any()); 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 @Test
public void beSearching_getP2pStateDisabledIntent_shouldBeFalse() { public void beSearching_getP2pStateDisabledIntent_shouldBeFalse() {
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();