PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add onErrorListner for SliceLiveData"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-01 23:46:51 +00:00
committed by Android (Google) Code Review
parent a623335ec0 19c2a20d9a
commit 240572f0c2
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
View File

@@ -43,6 +43,7 @@ import com.android.settings.homepage.contextualcards.CardContentProvider;
import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardRenderer; import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
import com.android.settings.homepage.contextualcards.ControllerRendererPool; import com.android.settings.homepage.contextualcards.ControllerRendererPool;
import com.android.settingslib.utils.ThreadUtils;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -104,7 +105,15 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, Life
LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri); LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri);
if (sliceLiveData == null) { if (sliceLiveData == null) {
sliceLiveData = SliceLiveData.fromUri(mContext, uri); sliceLiveData = SliceLiveData.fromUri(mContext, uri,
(int type, Throwable source) -> {
// onSliceError doesn't handle error Slices.
Log.w(TAG, "Slice may be null. uri = " + uri + ", error = " + type);
ThreadUtils.postOnMainThread(
() -> mSliceLiveDataMap.get(uri).removeObservers(mLifecycleOwner));
mContext.getContentResolver()
.notifyChange(CardContentProvider.REFRESH_CARD_URI, null);
});
mSliceLiveDataMap.put(uri, sliceLiveData); mSliceLiveDataMap.put(uri, sliceLiveData);
} }
@@ -115,13 +124,6 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, Life
swipeBackground.setVisibility(View.GONE); swipeBackground.setVisibility(View.GONE);
} }
sliceLiveData.observe(mLifecycleOwner, slice -> { sliceLiveData.observe(mLifecycleOwner, slice -> {
if (slice == null) {
Log.w(TAG, "Slice is null");
mContext.getContentResolver().notifyChange(CardContentProvider.REFRESH_CARD_URI,
null);
return;
}
if (slice.hasHint(HINT_ERROR)) { if (slice.hasHint(HINT_ERROR)) {
Log.w(TAG, "Slice has HINT_ERROR, skipping rendering. uri=" + slice.getUri()); Log.w(TAG, "Slice has HINT_ERROR, skipping rendering. uri=" + slice.getUri());
mSliceLiveDataMap.get(slice.getUri()).removeObservers(mLifecycleOwner); mSliceLiveDataMap.get(slice.getUri()).removeObservers(mLifecycleOwner);