diff options
| author | 2023-08-30 14:59:06 -0400 | |
|---|---|---|
| committer | 2023-09-11 12:57:40 -0400 | |
| commit | 5591d163172fac7e7f5786ea28adde437a841e26 (patch) | |
| tree | e7aed5cf7699ae8e7675082a6f06e989530c9e88 /java/tests | |
| parent | cfc377b37c1e0164f830bbbe8933731a591e7ed7 (diff) | |
Enable dependency injection using Hilt
This includes modifications to initialization of ChooserActivity
to avoid violating scoping and order of initialization.
Bug: 299610743
Test: atest IntentResolverUnitTests
Test: atest CtsSharesheetDeviceTest
Change-Id: I6570bda272eff44b3a64eab9df38049beb9c9fcc
Diffstat (limited to 'java/tests')
| -rw-r--r-- | java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java | 3 | ||||
| -rw-r--r-- | java/tests/src/com/android/intentresolver/TestApplication.kt | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java index 8608cf72..8c2a15f1 100644 --- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java +++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java @@ -51,8 +51,7 @@ import java.util.function.Consumer; * Simple wrapper around chooser activity to be able to initiate it under test. For more * information, see {@code com.android.internal.app.ChooserWrapperActivity}. */ -public class ChooserWrapperActivity - extends com.android.intentresolver.ChooserActivity implements IChooserWrapper { +public class ChooserWrapperActivity extends ChooserActivity implements IChooserWrapper { static final ChooserActivityOverrideData sOverrides = ChooserActivityOverrideData.getInstance(); private UsageStatsManager mUsm; diff --git a/java/tests/src/com/android/intentresolver/TestApplication.kt b/java/tests/src/com/android/intentresolver/TestApplication.kt index 849cfbab..b57fd4d9 100644 --- a/java/tests/src/com/android/intentresolver/TestApplication.kt +++ b/java/tests/src/com/android/intentresolver/TestApplication.kt @@ -16,12 +16,11 @@ package com.android.intentresolver -import android.app.Application import android.content.Context import android.os.UserHandle -class TestApplication : Application() { +class TestApplication : MainApplication() { // return the current context as a work profile doesn't really exist in these tests override fun createContextAsUser(user: UserHandle, flags: Int): Context = this -}
\ No newline at end of file +} |