diff options
| author | 2022-12-02 07:40:58 +0000 | |
|---|---|---|
| committer | 2022-12-02 07:40:58 +0000 | |
| commit | 53daccbd3ca60796535bf0065caf1101e4ea9751 (patch) | |
| tree | 75b32839a7182d65eef0cfe11f04378ed391cc2d /java/src | |
| parent | 90b6968d4bb29defddf19f480001ecfbcce0b23f (diff) | |
| parent | d293b3b3102ef5e3944422fd6bc2cbe7109edf36 (diff) | |
Merge "Fix NPE from dependency initialization order" into tm-qpr-dev am: d293b3b310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20610250
Change-Id: Ide257da5d397d2b10f00020ba3121703ced21242
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/ChooserActivity.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 6b7bf614..fe1df879 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -147,7 +147,6 @@ import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.function.Consumer; -import java.util.function.Supplier; /** * The Chooser Activity handles intent resolution specifically for sharing intents - @@ -355,6 +354,12 @@ public class ChooserActivity extends ResolverActivity implements mChooserRequest.getTargetIntentFilter()), mChooserRequest.getTargetIntentFilter()); + mPreviewCoordinator = new ChooserContentPreviewCoordinator( + mBackgroundThreadPoolExecutor, + this, + this::hideContentPreview, + this::setupPreDrawForSharedElementTransition); + super.onCreate( savedInstanceState, mChooserRequest.getTargetIntent(), @@ -364,12 +369,6 @@ public class ChooserActivity extends ResolverActivity implements /* rList: List<ResolveInfo> = */ null, /* supportsAlwaysUseOption = */ false); - mPreviewCoordinator = new ChooserContentPreviewCoordinator( - mBackgroundThreadPoolExecutor, - this, - this::hideContentPreview, - this::setupPreDrawForSharedElementTransition); - mChooserShownTime = System.currentTimeMillis(); final long systemCost = mChooserShownTime - intentReceivedTime; |