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

Commit dd5e4674 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:... 

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

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



Change-Id: I23c0fa56c122e7406229fc80bbe49fcba7160861
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1b9db50 1b70bcbd

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

+4 −1
Original line number Diff line number Diff line
@@ -636,10 +636,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
@@ -149,10 +149,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);
@@ -160,6 +160,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();