diff options
| author | 2024-12-12 10:35:54 -0800 | |
|---|---|---|
| committer | 2024-12-12 14:06:53 -0800 | |
| commit | ba74cdad9bb6fe8a824f787e776b0a414e8fd495 (patch) | |
| tree | 81af435e593ee4b519e1f0452a39f62dcc7727cd /java/src | |
| parent | effd3e6c1bba8d5d5ce8047b9a1e455816fcd4b3 (diff) | |
A feature flag removal
Remove 24Q4-released 'fix_shortcut_loader_job_leak' feature flag.
Bug: 358135601
Test: presubmits
Flag: EXEMPT flag removal
Change-Id: I04242737b6269322231527b2110e6a5a07b31777
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt b/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt index 828d8561..41f838ee 100644 --- a/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt +++ b/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt @@ -35,7 +35,6 @@ import androidx.annotation.MainThread import androidx.annotation.OpenForTesting import androidx.annotation.VisibleForTesting import androidx.annotation.WorkerThread -import com.android.intentresolver.Flags.fixShortcutLoaderJobLeak import com.android.intentresolver.Flags.fixShortcutsFlashing import com.android.intentresolver.chooser.DisplayResolveInfo import com.android.intentresolver.measurements.Tracer @@ -80,8 +79,7 @@ constructor( private val dispatcher: CoroutineDispatcher, private val callback: Consumer<Result>, ) { - private val scope = - if (fixShortcutLoaderJobLeak()) parentScope.createChildScope() else parentScope + private val scope = parentScope.createChildScope() private val shortcutToChooserTargetConverter = ShortcutToChooserTargetConverter() private val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager private val appPredictorWatchdog = AtomicReference<Job?>(null) @@ -170,9 +168,7 @@ constructor( @OpenForTesting open fun destroy() { - if (fixShortcutLoaderJobLeak()) { - scope.cancel() - } + scope.cancel() } @WorkerThread |