Merge "Don't crash in SecondaryUserController." into oc-dev

2017-04-12 18:57:47 +00:00
parent ec7ebc3f72 06470b68e0
commit aa3685fe14
2 changed files with 25 additions and 3 deletions
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -211,4 +211,20 @@ public class SecondaryUserControllerTest {
        Preference preference = argumentCaptor.getValue();
        assertThat(preference.getIcon()).isEqualTo(drawable);
    }
+
+    @Test
+    public void setIcon_doesntNpeOnNullPreference() throws Exception {
+        SparseArray<Drawable> icons = new SparseArray<>();
+        Bitmap userBitmap =
+                BitmapFactory.decodeResource(
+                        RuntimeEnvironment.application.getResources(), R.drawable.home);
+        UserIconDrawable drawable = new UserIconDrawable(100 /* size */).setIcon(userBitmap).bake();
+        icons.put(10, drawable);
+        mPrimaryUser.name = TEST_NAME;
+        mPrimaryUser.id = 10;
+
+        mController.handleUserIcons(icons);
+
+        // Doesn't crash
+    }
 }