Merge changes from topic "adbwifi-bugs"

* changes:
  Add toast error message for no WiFi on wireless debugging.
  Add visibility control to ADB QR code preference.

tests/robotests/src/com/android/settings/development/AdbQrCodePreferenceControllerTest.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2020 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.development;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.debug.IAdbManager;
+import android.os.RemoteException;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUtils.class)
+public class AdbQrCodePreferenceControllerTest {
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private IAdbManager mAdbManager;
+    @Mock
+    private WirelessDebuggingFragment mFragment;
+
+    private AdbQrCodePreferenceController mController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new AdbQrCodePreferenceController(mContext, "test_key"));
+        mController.setParentFragment(mFragment);
+        ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mPreference.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void getAvailabilityStatus_isAdbWifiQrSupported_yes_shouldBeTrue()
+            throws RemoteException {
+        when(mAdbManager.isAdbWifiQrSupported()).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_isAdbWifiQrSupported_no_shouldBeFalse()
+            throws RemoteException {
+        when(mAdbManager.isAdbWifiQrSupported()).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void displayPreference_isAdbWifiQrSupported_yes_prefIsVisible() throws RemoteException {
+        when(mAdbManager.isAdbWifiQrSupported()).thenReturn(true);
+
+        mController.displayPreference(mScreen);
+        verify(mPreference).setVisible(true);
+    }
+
+    @Test
+    public void displayPreference_isAdbWifiQrSupported_no_prefIsNotVisible()
+            throws RemoteException {
+        when(mAdbManager.isAdbWifiQrSupported()).thenReturn(false);
+
+        mController.displayPreference(mScreen);
+        verify(mPreference).setVisible(false);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_launchActivity() {
+        final String preferenceKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(preferenceKey);
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).startActivityForResult(any(Intent.class),
+                eq(WirelessDebuggingFragment.PAIRING_DEVICE_REQUEST));
+    }
+}

tests/robotests/src/com/android/settings/development/WirelessDebuggingEnablerTest.java

@@ -28,10 +28,12 @@ import android.provider.Settings.Global;
 import androidx.lifecycle.LifecycleOwner;
 
 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.SwitchBarController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,7 +45,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowUtils.class)
+@Config(shadows = {ShadowUtils.class, ShadowWirelessDebuggingPreferenceController.class})
 public class WirelessDebuggingEnablerTest {
 
     @Mock
@@ -66,6 +68,11 @@ public class WirelessDebuggingEnablerTest {
                 mContext, new SwitchBarController(mSwitchBar), mListener, mLifecycle));
     }
 
+    @After
+    public void tearDown() {
+        ShadowWirelessDebuggingPreferenceController.reset();
+    }
+
     @Test
     public void onCreation_shouldShowSwitchBar() {
         verify(mSwitchBar).show();
@@ -120,7 +127,8 @@ public class WirelessDebuggingEnablerTest {
     }
 
     @Test
-    public void onSwitchToggled_true_shouldSetAdbWifiEnabledTrue() {
+    public void onSwitchToggled_true_wifiConnected_shouldSetAdbWifiEnabledTrue() {
+        ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
         Global.putInt(mContext.getContentResolver(),
                 Global.ADB_WIFI_ENABLED, 0 /* setting disabled */);
         mWirelessDebuggingEnabler.onResume();
@@ -132,11 +140,27 @@ public class WirelessDebuggingEnablerTest {
 
         assertThat(Global.getInt(mContext.getContentResolver(),
                 Global.ADB_WIFI_ENABLED, -1)).isEqualTo(1);
-        // Should also get a callback
     }
 
     @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();
@@ -147,7 +171,22 @@ public class WirelessDebuggingEnablerTest {
         mWirelessDebuggingEnabler.onSwitchToggled(false);
 
         assertThat(Global.getInt(mContext.getContentResolver(),
-            Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
-        // Should also get a callback
+                Global.ADB_WIFI_ENABLED, -1)).isEqualTo(0);
+    }
+
+    @Test
+    public void onSwitchToggled_false_wifiNotConnected_shouldSetAdbWifiEnabledFalse() {
+        ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(false);
+        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);
     }
 }

tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java

@@ -32,6 +32,7 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -47,7 +48,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowUtils.class)
+@Config(shadows = {ShadowUtils.class, ShadowWirelessDebuggingPreferenceController.class})
 public class WirelessDebuggingPreferenceControllerTest {
 
     @Mock
@@ -75,10 +76,12 @@ public class WirelessDebuggingPreferenceControllerTest {
         mController = spy(new WirelessDebuggingPreferenceController(mContext, mLifecycle));
         ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        Global.putInt(mContentResolver, Global.ADB_WIFI_ENABLED, 0);
     }
 
     @After
     public void tearDown() {
+        ShadowWirelessDebuggingPreferenceController.reset();
     }
 
     @Test
@@ -112,9 +115,35 @@ public class WirelessDebuggingPreferenceControllerTest {
     }
 
     @Test
-    public void onPreferenceChange_turnOn_adbWifiEnabledTrue() {
+    public void onPreferenceChange_turnOn_wifiConnected_adbWifiEnabledTrue() {
+        ShadowWirelessDebuggingPreferenceController.setIsWifiConnected(true);
         mController.onPreferenceChange(null, true);
 
         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);
+    }
 }

tests/robotests/src/com/android/settings/testutils/shadow/ShadowWirelessDebuggingPreferenceController.java

@@ -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;
+    }
+}