Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: 949c937fce

am: 2dd116845a

Change-Id: I8f7c3467362d2e4662c0a7ad9649a2b1ab505c07

tests/robotests/src/com/android/settings/slices/SlicePreferenceControllerTest.java

@@ -41,6 +41,8 @@ public class SlicePreferenceControllerTest {
 
     @Mock
     private LiveData<Slice> mLiveData;
+    @Mock
+    private SlicePreference mSlicePreference;
     private Context mContext;
     private SlicePreferenceController mController;
     private Uri mUri;
@@ -53,6 +55,7 @@ public class SlicePreferenceControllerTest {
         mContext = spy(RuntimeEnvironment.application);
         mController = new SlicePreferenceController(mContext, KEY);
         mController.mLiveData = mLiveData;
+        mController.mSlicePreference = mSlicePreference;
         mUri = Uri.EMPTY;
     }
 
@@ -78,4 +81,11 @@ public class SlicePreferenceControllerTest {
         mController.onStop();
         verify(mLiveData).removeObserver(mController);
     }
+
+    @Test
+    public void onChanged_nullSlice_updateSlice() {
+        mController.onChanged(null);
+
+        verify(mController.mSlicePreference).onSliceUpdated(null);
+    }
 }