Add toast error message for no WiFi on wireless debugging.
Show a toast to connect to a WiFi network when the user tries to enable wireless debugging while not connected to any Wi-Fi network. Bug: 150139061 Bug: 149843499 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5 Exempt-From-Owner-Approval: LGTM
This commit is contained in:
@@ -24,7 +24,9 @@ import android.os.Handler;
|
|||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
import com.android.settings.widget.SwitchWidgetController;
|
import com.android.settings.widget.SwitchWidgetController;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
@@ -121,6 +123,15 @@ public class WirelessDebuggingEnabler implements SwitchWidgetController.OnSwitch
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onSwitchToggled(boolean isChecked) {
|
public boolean onSwitchToggled(boolean isChecked) {
|
||||||
|
if (isChecked && !WirelessDebuggingPreferenceController.isWifiConnected(mContext)) {
|
||||||
|
// No connected Wi-Fi network. Reset the switch to off.
|
||||||
|
Toast.makeText(
|
||||||
|
mContext, R.string.adb_wireless_no_network_msg, Toast.LENGTH_LONG)
|
||||||
|
.show();
|
||||||
|
mSwitchWidget.setChecked(false);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
writeAdbWifiSetting(isChecked);
|
writeAdbWifiSetting(isChecked);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -19,6 +19,8 @@ import android.content.ContentResolver;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.database.ContentObserver;
|
import android.database.ContentObserver;
|
||||||
import android.debug.IAdbManager;
|
import android.debug.IAdbManager;
|
||||||
|
import android.net.ConnectivityManager;
|
||||||
|
import android.net.NetworkInfo;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
@@ -26,10 +28,12 @@ import android.os.RemoteException;
|
|||||||
import android.os.ServiceManager;
|
import android.os.ServiceManager;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.PreferenceControllerMixin;
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
import com.android.settings.widget.MasterSwitchPreference;
|
import com.android.settings.widget.MasterSwitchPreference;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
@@ -131,9 +135,29 @@ public class WirelessDebuggingPreferenceController extends DeveloperOptionsPrefe
|
|||||||
((MasterSwitchPreference) preference).setChecked(enabled);
|
((MasterSwitchPreference) preference).setChecked(enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean isWifiConnected(Context context) {
|
||||||
|
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
|
||||||
|
Context.CONNECTIVITY_SERVICE);
|
||||||
|
if (cm != null) {
|
||||||
|
NetworkInfo info = cm.getActiveNetworkInfo();
|
||||||
|
if (info != null && info.isConnected()) {
|
||||||
|
return info.getType() == ConnectivityManager.TYPE_WIFI;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
final boolean enabled = (Boolean) newValue;
|
final boolean enabled = (Boolean) newValue;
|
||||||
|
if (enabled && !isWifiConnected(mContext)) {
|
||||||
|
// Cannot enable ADB over Wi-Fi if we're not connected to wifi.
|
||||||
|
Toast.makeText(
|
||||||
|
mContext, R.string.adb_wireless_no_network_msg, Toast.LENGTH_LONG)
|
||||||
|
.show();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
Settings.Global.putInt(mContext.getContentResolver(),
|
Settings.Global.putInt(mContext.getContentResolver(),
|
||||||
Settings.Global.ADB_WIFI_ENABLED,
|
Settings.Global.ADB_WIFI_ENABLED,
|
||||||
enabled ? AdbPreferenceController.ADB_SETTING_ON
|
enabled ? AdbPreferenceController.ADB_SETTING_ON
|
||||||
|
@@ -28,10 +28,12 @@ import android.provider.Settings.Global;
|
|||||||
import androidx.lifecycle.LifecycleOwner;
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
|
||||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
|
||||||
import com.android.settings.widget.SwitchBar;
|
import com.android.settings.widget.SwitchBar;
|
||||||
import com.android.settings.widget.SwitchBarController;
|
import com.android.settings.widget.SwitchBarController;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
@@ -43,7 +45,7 @@ import org.robolectric.annotation.Config;
|
|||||||
import org.robolectric.util.ReflectionHelpers;
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = ShadowUtils.class)
|
@Config(shadows = {ShadowUtils.class, ShadowWirelessDebuggingPreferenceController.class})
|
||||||
public class WirelessDebuggingEnablerTest {
|
public class WirelessDebuggingEnablerTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
@@ -66,6 +68,11 @@ public class WirelessDebuggingEnablerTest {
|
|||||||
mContext, new SwitchBarController(mSwitchBar), mListener, mLifecycle));
|
mContext, new SwitchBarController(mSwitchBar), mListener, mLifecycle));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.reset();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onCreation_shouldShowSwitchBar() {
|
public void onCreation_shouldShowSwitchBar() {
|
||||||
verify(mSwitchBar).show();
|
verify(mSwitchBar).show();
|
||||||
@@ -120,7 +127,8 @@ public class WirelessDebuggingEnablerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSwitchToggled_true_shouldSetAdbWifiEnabledTrue() {
|
public void onSwitchToggled_true_wifiConnected_shouldSetAdbWifiEnabledTrue() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
|
||||||
Global.putInt(mContext.getContentResolver(),
|
Global.putInt(mContext.getContentResolver(),
|
||||||
Global.ADB_WIFI_ENABLED, 0 /* setting disabled */);
|
Global.ADB_WIFI_ENABLED, 0 /* setting disabled */);
|
||||||
mWirelessDebuggingEnabler.onResume();
|
mWirelessDebuggingEnabler.onResume();
|
||||||
@@ -132,11 +140,43 @@ public class WirelessDebuggingEnablerTest {
|
|||||||
|
|
||||||
assertThat(Global.getInt(mContext.getContentResolver(),
|
assertThat(Global.getInt(mContext.getContentResolver(),
|
||||||
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
|
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
|
||||||
// Should also get a callback
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onSwitchToggled_false_shouldSetAdbWifiEnabledFalse() {
|
public void onSwitchToggled_true_wifiNotConnected_shouldSetAdbWifiEnabledFalse() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(false);
|
||||||
|
Global.putInt(mContext.getContentResolver(),
|
||||||
|
Global.ADB_WIFI_ENABLED, 0 /* setting disabled */);
|
||||||
|
mWirelessDebuggingEnabler.onResume();
|
||||||
|
|
||||||
|
verify(mSwitchBar).setChecked(false);
|
||||||
|
verify(mListener).onEnabled(false);
|
||||||
|
|
||||||
|
mWirelessDebuggingEnabler.onSwitchToggled(true);
|
||||||
|
|
||||||
|
assertThat(Global.getInt(mContext.getContentResolver(),
|
||||||
|
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onSwitchToggled_false_wifiConnected_shouldSetAdbWifiEnabledFalse() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
|
||||||
|
Global.putInt(mContext.getContentResolver(),
|
||||||
|
Global.ADB_WIFI_ENABLED, 1 /* setting disabled */);
|
||||||
|
mWirelessDebuggingEnabler.onResume();
|
||||||
|
|
||||||
|
verify(mSwitchBar).setChecked(true);
|
||||||
|
verify(mListener).onEnabled(true);
|
||||||
|
|
||||||
|
mWirelessDebuggingEnabler.onSwitchToggled(false);
|
||||||
|
|
||||||
|
assertThat(Global.getInt(mContext.getContentResolver(),
|
||||||
|
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onSwitchToggled_false_wifiNotConnected_shouldSetAdbWifiEnabledFalse() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(false);
|
||||||
Global.putInt(mContext.getContentResolver(),
|
Global.putInt(mContext.getContentResolver(),
|
||||||
Global.ADB_WIFI_ENABLED, 1 /* setting disabled */);
|
Global.ADB_WIFI_ENABLED, 1 /* setting disabled */);
|
||||||
mWirelessDebuggingEnabler.onResume();
|
mWirelessDebuggingEnabler.onResume();
|
||||||
@@ -148,6 +188,5 @@ public class WirelessDebuggingEnablerTest {
|
|||||||
|
|
||||||
assertThat(Global.getInt(mContext.getContentResolver(),
|
assertThat(Global.getInt(mContext.getContentResolver(),
|
||||||
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
// Should also get a callback
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -32,6 +32,7 @@ import androidx.lifecycle.LifecycleOwner;
|
|||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
|
||||||
import com.android.settings.widget.MasterSwitchPreference;
|
import com.android.settings.widget.MasterSwitchPreference;
|
||||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||||
|
|
||||||
@@ -47,7 +48,7 @@ import org.robolectric.annotation.Config;
|
|||||||
import org.robolectric.util.ReflectionHelpers;
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
@Config(shadows = ShadowUtils.class)
|
@Config(shadows = {ShadowUtils.class, ShadowWirelessDebuggingPreferenceController.class})
|
||||||
public class WirelessDebuggingPreferenceControllerTest {
|
public class WirelessDebuggingPreferenceControllerTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
@@ -75,10 +76,12 @@ public class WirelessDebuggingPreferenceControllerTest {
|
|||||||
mController = spy(new WirelessDebuggingPreferenceController(mContext, mLifecycle));
|
mController = spy(new WirelessDebuggingPreferenceController(mContext, mLifecycle));
|
||||||
ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
|
ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
|
||||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||||
|
Global.putInt(mContentResolver, Global.ADB_WIFI_ENABLED, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@After
|
||||||
public void tearDown() {
|
public void tearDown() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -112,9 +115,35 @@ public class WirelessDebuggingPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onPreferenceChange_turnOn_adbWifiEnabledTrue() {
|
public void onPreferenceChange_turnOn_wifiConnected_adbWifiEnabledTrue() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
|
||||||
mController.onPreferenceChange(null, true);
|
mController.onPreferenceChange(null, true);
|
||||||
|
|
||||||
assertThat(Global.getInt(mContentResolver, Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
|
assertThat(Global.getInt(mContentResolver, Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_turnOff_wifiConnected_adbWifiEnabledFalse() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
|
||||||
|
mController.onPreferenceChange(null, false);
|
||||||
|
|
||||||
|
assertThat(Global.getInt(mContentResolver, Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_turnOn_wifiNotConnected_adbWifiEnabledFalse() {
|
||||||
|
// Should not be able to enable wifi debugging without being connected to a wifi network
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(false);
|
||||||
|
mController.onPreferenceChange(null, true);
|
||||||
|
|
||||||
|
assertThat(Global.getInt(mContentResolver, Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChange_turnOff_wifiNotConnected_adbWifiEnabledFalse() {
|
||||||
|
ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(false);
|
||||||
|
mController.onPreferenceChange(null, false);
|
||||||
|
|
||||||
|
assertThat(Global.getInt(mContentResolver, Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.testutils.shadow;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import com.android.settings.development.WirelessDebuggingPreferenceController;
|
||||||
|
|
||||||
|
import org.robolectric.annotation.Implementation;
|
||||||
|
import org.robolectric.annotation.Implements;
|
||||||
|
|
||||||
|
@Implements(WirelessDebuggingPreferenceController.class)
|
||||||
|
public class ShadowWirelessDebuggingPreferenceController {
|
||||||
|
private static boolean sIsWifiConnected;
|
||||||
|
|
||||||
|
public static void setIsWifiConnected(boolean isConnected) {
|
||||||
|
sIsWifiConnected = isConnected;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void reset() {
|
||||||
|
sIsWifiConnected = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Implementation
|
||||||
|
protected static boolean isWifiConnected(Context context) {
|
||||||
|
return sIsWifiConnected;
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user