From 5591d163172fac7e7f5786ea28adde437a841e26 Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Wed, 30 Aug 2023 14:59:06 -0400
Subject: 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
---
 .../tests/src/com/android/intentresolver/ChooserWrapperActivity.java | 3 +--
 java/tests/src/com/android/intentresolver/TestApplication.kt         | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'java/tests')

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
+}
-- 
cgit v1.2.3-59-g8ed1b