summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorJason Chiu <chiujason@google.com>2020-06-24 03:53:47 +0000
committerJason Chiu <chiujason@google.com>2020-06-24 03:53:47 +0000
commit1b514c3f3776b811c1d0a0af8ccd9a77f21d6d73 (patch)
tree9bf7426c4cb2c4dd18a9fe3e5be9d3ad73a27846 /src/com/android/settings
parent73afb042dc3e6359f0d3350bc25038c5f26d0826 (diff)
downloadpackages_apps_Settings-1b514c3f3776b811c1d0a0af8ccd9a77f21d6d73.tar.gz
packages_apps_Settings-1b514c3f3776b811c1d0a0af8ccd9a77f21d6d73.tar.bz2
packages_apps_Settings-1b514c3f3776b811c1d0a0af8ccd9a77f21d6d73.zip
Revert "Workaround of Slice not pinned bug when using SliceCallback"
This reverts commit 73afb042dc3e6359f0d3350bc25038c5f26d0826. Reason for revert: Publish the fix in Slice lib and revert the workaround. Bug: 157387583 Change-Id: Icb150b4f69bffe8af4c3fcb26501020c8fe8432b
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
index 46b4c869ec..43403306cb 100644
--- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
+++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
@@ -22,7 +22,6 @@ import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
-import android.os.AsyncTask;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
@@ -33,7 +32,6 @@ import androidx.slice.core.SliceAction;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
import java.util.concurrent.Callable;
@@ -117,12 +115,7 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
// Register a trivial callback to pin the slice
manager.registerSliceCallback(uri, callback);
final Slice slice = manager.bindSlice(uri);
-
- // Workaround of unpinning slice in the same SerialExecutor of AsyncTask as SliceCallback's
- // observer.
- ThreadUtils.postOnMainThread(() ->
- AsyncTask.execute(() -> manager.unregisterSliceCallback(uri, callback))
- );
+ manager.unregisterSliceCallback(uri, callback);
return slice;
}