Merge "Fix Wi-Fi DPP fragment back stack problems"

2019-02-12 03:17:57 +00:00
parent dd1c68b12d 9d33313735
commit d9b86280d5
5 changed files with 114 additions and 49 deletions
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
@@ -98,7 +98,6 @@ public class WifiNetworkListFragmentTest {
    private void callOnWifiStateChanged(int state) {
        mActivityRule.getActivity().getMainThreadHandler()
                .post(() -> mWifiNetworkListFragment.onWifiStateChanged(state));
-        mWifiNetworkListFragment.mUseConnectedAccessPointDirectly = false;
    }

    /** Launch the activity via an Intent with a String extra. */
@@ -173,4 +172,4 @@ public class WifiNetworkListFragmentTest {
        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
                matches(isDisplayed()));
    }
-}
+}