Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344

Change-Id: Ib482b91a0fc2b10d17150f212b2990ef753347a1
This commit is contained in:
TreeHugger Robot
2020-06-20 09:57:03 +00:00
committed by Automerger Merge Worker

View File

@@ -110,9 +110,13 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
@VisibleForTesting @VisibleForTesting
Slice bindSlice(Uri uri) { Slice bindSlice(Uri uri) {
final SliceViewManager manager = SliceViewManager.getInstance(mContext); final SliceViewManager manager = SliceViewManager.getInstance(mContext);
manager.pinSlice(uri); final SliceViewManager.SliceCallback callback = slice -> { };
// Register a trivial callback to pin the slice
manager.registerSliceCallback(uri, callback);
final Slice slice = manager.bindSlice(uri); final Slice slice = manager.bindSlice(uri);
manager.unpinSlice(uri); manager.unregisterSliceCallback(uri, callback);
return slice; return slice;
} }