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

Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0

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

Change-Id: I9d9c01e7ff707dd2024f8d880fdeed7dcea17faa
This commit is contained in:
TreeHugger Robot
2020-06-26 16:54:26 +00:00
committed by Automerger Merge Worker
parent 63cfc7a392 15a62defd0
commit 263de56a8d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
View File

@@ -22,6 +22,7 @@ import android.app.settings.SettingsEnums;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -32,6 +33,7 @@ import androidx.slice.core.SliceAction;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List; import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@@ -115,7 +117,12 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
// Register a trivial callback to pin the slice // Register a trivial callback to pin the slice
manager.registerSliceCallback(uri, callback); manager.registerSliceCallback(uri, callback);
final Slice slice = manager.bindSlice(uri); final Slice slice = manager.bindSlice(uri);
manager.unregisterSliceCallback(uri, callback);
// Workaround of unpinning slice in the same SerialExecutor of AsyncTask as SliceCallback's
// observer.
ThreadUtils.postOnMainThread(() ->
AsyncTask.execute(() -> manager.unregisterSliceCallback(uri, callback))
);
return slice; return slice;
} }