Merge "Update SliceView when slice is null" into qt-dev

am: f32025a17d

Change-Id: I3ada32a9c34ded2d1324228314272030b6f6b489
This commit is contained in:
Lei Yu
2019-05-30 11:00:45 -07:00
committed by android-build-merger
2 changed files with 13 additions and 4 deletions

View File

@@ -40,7 +40,8 @@ public class SlicePreferenceController extends BasePreferenceController implemen
LifecycleObserver, OnStart, OnStop, Observer<Slice> {
@VisibleForTesting
LiveData<Slice> mLiveData;
private SlicePreference mSlicePreference;
@VisibleForTesting
SlicePreference mSlicePreference;
private Uri mUri;
public SlicePreferenceController(Context context, String preferenceKey) {
@@ -82,8 +83,6 @@ public class SlicePreferenceController extends BasePreferenceController implemen
@Override
public void onChanged(Slice slice) {
if (slice != null) {
mSlicePreference.onSliceUpdated(slice);
}
mSlicePreference.onSliceUpdated(slice);
}
}