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

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

Merge "Make p2p start searching after turning off airplane mode." am: adb5c502 

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



Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73c0f408 adb5c502

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

+4 −1
Original line number Diff line number Diff line
@@ -630,10 +630,13 @@ public class WifiP2pSettings extends DashboardFragment 
    }



    private void handleP2pStateChanged() {

        updateSearchMenu(false);

        mThisDevicePreferenceController.setEnabled(mWifiP2pEnabled);

        mPersistentCategoryController.setEnabled(mWifiP2pEnabled);

        mPeerCategoryController.setEnabled(mWifiP2pEnabled);

        if (mWifiP2pEnabled) {

            startSearch();

        }

        updateSearchMenu(mWifiP2pEnabled);

    }



    private void updateSearchMenu(boolean searching) {

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

+14 −2
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ public class WifiP2pSettingsTest { 
    }



    @Test

    public void beSearching_getP2pStateEnabledIntent_shouldBeFalse() {

    public void beSearching_getP2pStateDisabledIntent_shouldBeFalse() {

        final Bundle bundle = new Bundle();

        final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);

        bundle.putInt(WifiP2pManager.EXTRA_WIFI_STATE, WifiP2pManager.WIFI_P2P_STATE_ENABLED);

        bundle.putInt(WifiP2pManager.EXTRA_WIFI_STATE, WifiP2pManager.WIFI_P2P_STATE_DISABLED);

        intent.putExtras(bundle);



        mFragment.mReceiver.onReceive(mContext, intent);
@@ -158,6 +158,18 @@ public class WifiP2pSettingsTest { 
        assertThat(mFragment.mWifiP2pSearching).isFalse();

    }



    @Test

    public void beSearching_getP2pStateEnabledIntent_shouldBeTrue() {

        final Bundle bundle = new Bundle();

        final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);

        bundle.putInt(WifiP2pManager.EXTRA_WIFI_STATE, WifiP2pManager.WIFI_P2P_STATE_ENABLED);

        intent.putExtras(bundle);



        mFragment.mReceiver.onReceive(mContext, intent);



        assertThat(mFragment.mWifiP2pSearching).isTrue();

    }



    @Test

    public void withEmptyP2pDeviceList_getP2pPeerChangeIntent_connectedDevicesShouldBeZero() {

        final WifiP2pDeviceList peers = new WifiP2pDeviceList();