diff options
| author | 2023-03-28 15:55:39 +0000 | |
|---|---|---|
| committer | 2023-03-28 15:55:39 +0000 | |
| commit | ebc5d9c2c4200519f62a235eba748bcdc68177d8 (patch) | |
| tree | f8dd0ea89a10a785b90f9ff48811071b9402049b /java/src | |
| parent | b7cb44d46bb5aa6064ea0c2fb82a39d032f15c1a (diff) | |
| parent | 9c1f13565a33f4846aa9255ba74b0ef1c49b972a (diff) | |
Merge "Fallback to ShortcutManager if AppPredictor has crashed" into udc-dev am: 9c1f13565a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22285708
Change-Id: If88b927bbdf29acb16e6e9cfb924d8fc8eedbdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt b/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt index 6f7542f1..29e706d4 100644 --- a/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt +++ b/java/src/com/android/intentresolver/shortcuts/ShortcutLoader.kt @@ -77,6 +77,7 @@ open class ShortcutLoader @VisibleForTesting constructor( private val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager private val activeRequest = AtomicReference(NO_REQUEST) private val appPredictorCallback = AppPredictor.Callback { onAppPredictorCallback(it) } + @Volatile private var isDestroyed = false @MainThread @@ -134,8 +135,14 @@ open class ShortcutLoader @VisibleForTesting constructor( @WorkerThread private fun queryDirectShareTargets(skipAppPredictionService: Boolean) { if (!skipAppPredictionService && appPredictor != null) { - appPredictor.requestPredictionUpdate() - return + try { + appPredictor.requestPredictionUpdate() + return + } catch (e: Throwable) { + // we might have been destroyed concurrently, nothing left to do + if (isDestroyed) return + Log.e(TAG, "Failed to query AppPredictor", e) + } } // Default to just querying ShortcutManager if AppPredictor not present. if (targetIntentFilter == null) return |