Merge "Fix content observer in SliceView"

2017-11-06 14:47:14 +00:00
parent 993ebff17e 603e779aa5
commit a7d81598b5
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/app/slice/widget/SliceView.java
+++ b/core/java/android/app/slice/widget/SliceView.java
@@ -212,11 +212,15 @@ public class SliceView extends ViewGroup {
        validate(sliceUri);
        Slice s = Slice.bindSlice(mContext.getContentResolver(), sliceUri);
        if (s != null) {
+            if (mObserver != null) {
+                getContext().getContentResolver().unregisterContentObserver(mObserver);
+            }
            mObserver = new SliceObserver(new Handler(Looper.getMainLooper()));
            if (isAttachedToWindow()) {
                registerSlice(sliceUri);
            }
-            showSlice(s);
+            mCurrentSlice = s;
+            reinflate();
        }
        return s != null;
    }