Merge "Make p2p start searching after turning off airplane mode." (adb5c502) · Commits · e / os / android_packages_apps_Settings

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

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