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

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

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

Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-16 09:08:59 +00:00
committed by Automerger Merge Worker
parent 73c0f408a4 adb5c5025a
commit 425521478a
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -630,10 +630,13 @@ public class WifiP2pSettings extends DashboardFragment
} }
private void handleP2pStateChanged() { private void handleP2pStateChanged() {
updateSearchMenu(false);
mThisDevicePreferenceController.setEnabled(mWifiP2pEnabled); mThisDevicePreferenceController.setEnabled(mWifiP2pEnabled);
mPersistentCategoryController.setEnabled(mWifiP2pEnabled); mPersistentCategoryController.setEnabled(mWifiP2pEnabled);
mPeerCategoryController.setEnabled(mWifiP2pEnabled); mPeerCategoryController.setEnabled(mWifiP2pEnabled);
if (mWifiP2pEnabled) {
startSearch();
}
updateSearchMenu(mWifiP2pEnabled);
} }
private void updateSearchMenu(boolean searching) { private void updateSearchMenu(boolean searching) {

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

@@ -147,7 +147,19 @@ public class WifiP2pSettingsTest {
} }
@Test @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_DISABLED);
intent.putExtras(bundle);
mFragment.mReceiver.onReceive(mContext, intent);
assertThat(mFragment.mWifiP2pSearching).isFalse();
}
@Test
public void beSearching_getP2pStateEnabledIntent_shouldBeTrue() {
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();
final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION); 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_ENABLED);
@@ -155,7 +167,7 @@ public class WifiP2pSettingsTest {
mFragment.mReceiver.onReceive(mContext, intent); mFragment.mReceiver.onReceive(mContext, intent);
assertThat(mFragment.mWifiP2pSearching).isFalse(); assertThat(mFragment.mWifiP2pSearching).isTrue();
} }
@Test @Test