Merge "Make metered wifi controller resilient to null config" into pi-dev am: 861bf93502

am: 0ec10e6a43 Change-Id: I79cf0e83ca9616d27b7f0d06c16f1415f2d91a77
2018-03-31 07:29:21 +00:00
parent 94bc86c12a 0ec10e6a43
commit a90332397b
2 changed files with 16 additions and 3 deletions
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
@@ -83,4 +83,12 @@ public class WifiMeteredPreferenceControllerTest {

        assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");
    }
+
+    @Test
+    public void testController_resilientToNullConfig() {
+        mPreferenceController = spy(new WifiMeteredPreferenceController(mContext, null));
+
+        mPreferenceController.getMeteredOverride();
+        mPreferenceController.onPreferenceChange(mDropDownPreference, new Integer(1));
+    }
 }