Merge "Add NPE check for method assignDefaultPhoto in Utils.java"

2016-12-28 22:28:10 +00:00
parent 56340d4306 8164c64edc
commit 3a21de9349
3 changed files with 23 additions and 4 deletions
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -65,4 +65,10 @@ public class UtilsTest {

        assertThat(Utils.getWifiIpAddresses(mContext)).isNull();
    }
+
+    @Test
+    public void testAssignDefaultPhoto_ContextNull_ReturnFalseAndNotCrash() {
+        // Should not crash here
+        assertThat(Utils.assignDefaultPhoto(null, 0)).isFalse();
+    }
 }