Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fedd6b35 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d1b67b7 dc98948c

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 -> {

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

+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();