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

Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5

Browse Source 
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
This commit is contained in:
Automerger Merge Worker
2020-03-11 11:40:51 +00:00
parent 2df7ee7f0e 21338186d5
commit f3aa88ccf2
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,11 @@ 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) {
// The logic handling this case is in OnErrorListener. Adding this check is to
// prevent from NPE when it calls .hasHint().
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);