Collapse v2 fork

This is an internal merge of v2.* code back into a single
set of code. The ChooserSelector mechanism is removed and
usage of the 'modular_framework' AConfig flag is also removed.

Test: atest --test-mapping packages/modules/IntentResolver
Bug: NA
Flag: None
Change-Id: I8bb34613e5a042cfbcd8fe2654b8121560a47b03

7 files changed, 18 insertions, 40 deletions

diff --git a/tests/shared/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/PayloadToggleInteractorKosmos.kt b/tests/shared/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/PayloadToggleInteractorKosmos.kt
index 9e34acff..659c178c 100644
--- a/tests/shared/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/PayloadToggleInteractorKosmos.kt
+++ b/tests/shared/src/com/android/intentresolver/contentpreview/payloadtoggle/domain/interactor/PayloadToggleInteractorKosmos.kt
@@ -29,10 +29,10 @@ import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.pen
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.intent.targetIntentModifier
 import com.android.intentresolver.contentpreview.payloadtoggle.domain.update.selectionChangeCallback
 import com.android.intentresolver.contentpreview.uriMetadataReader
+import com.android.intentresolver.data.repository.chooserRequestRepository
 import com.android.intentresolver.inject.contentUris
 import com.android.intentresolver.logging.eventLog
 import com.android.intentresolver.packageManager
-import com.android.intentresolver.v2.data.repository.chooserRequestRepository
 import com.android.systemui.kosmos.Kosmos
 import com.android.systemui.kosmos.Kosmos.Fixture
 
diff --git a/tests/shared/src/com/android/intentresolver/v2/data/repository/FakeUserRepository.kt b/tests/shared/src/com/android/intentresolver/data/repository/FakeUserRepository.kt
index 73d9a084..fb8fbd3f 100644
--- a/tests/shared/src/com/android/intentresolver/v2/data/repository/FakeUserRepository.kt
+++ b/tests/shared/src/com/android/intentresolver/data/repository/FakeUserRepository.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver.v2.data.repository
+package com.android.intentresolver.data.repository
 
-import com.android.intentresolver.v2.shared.model.User
+import com.android.intentresolver.shared.model.User
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
diff --git a/tests/shared/src/com/android/intentresolver/v2/data/repository/V2RepositoryKosmos.kt b/tests/shared/src/com/android/intentresolver/data/repository/V2RepositoryKosmos.kt
index ec6b2dec..0b2d3eb4 100644
--- a/tests/shared/src/com/android/intentresolver/v2/data/repository/V2RepositoryKosmos.kt
+++ b/tests/shared/src/com/android/intentresolver/data/repository/V2RepositoryKosmos.kt
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver.v2.data.repository
+package com.android.intentresolver.data.repository
 
-import com.android.intentresolver.v2.data.model.fakeChooserRequest
+import android.content.Intent
+import com.android.intentresolver.data.model.ChooserRequest
 import com.android.systemui.kosmos.Kosmos
 import com.android.systemui.kosmos.Kosmos.Fixture
 
 var Kosmos.chooserRequestRepository by Fixture {
-    ChooserRequestRepository(fakeChooserRequest(), emptyList())
+    ChooserRequestRepository(
+        initialRequest = ChooserRequest(targetIntent = Intent(), launchedFromPackage = "pkg"),
+        initialActions = emptyList()
+    )
 }
diff --git a/tests/shared/src/com/android/intentresolver/v2/ext/ParcelableExt.kt b/tests/shared/src/com/android/intentresolver/ext/ParcelableExt.kt
index 3878c39c..0b9caa32 100644
--- a/tests/shared/src/com/android/intentresolver/v2/ext/ParcelableExt.kt
+++ b/tests/shared/src/com/android/intentresolver/ext/ParcelableExt.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver.v2.ext
+package com.android.intentresolver.ext
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/tests/shared/src/com/android/intentresolver/v2/platform/FakeSecureSettings.kt b/tests/shared/src/com/android/intentresolver/platform/FakeSecureSettings.kt
index 4e279623..25711b70 100644
--- a/tests/shared/src/com/android/intentresolver/v2/platform/FakeSecureSettings.kt
+++ b/tests/shared/src/com/android/intentresolver/platform/FakeSecureSettings.kt
@@ -1,4 +1,4 @@
-package com.android.intentresolver.v2.platform
+package com.android.intentresolver.platform
 
 /**
  * Creates a SecureSettings instance with predefined values:
diff --git a/tests/shared/src/com/android/intentresolver/v2/platform/FakeUserManager.kt b/tests/shared/src/com/android/intentresolver/platform/FakeUserManager.kt
index d1b56d5f..b357a691 100644
--- a/tests/shared/src/com/android/intentresolver/v2/platform/FakeUserManager.kt
+++ b/tests/shared/src/com/android/intentresolver/platform/FakeUserManager.kt
@@ -1,4 +1,4 @@
-package com.android.intentresolver.v2.platform
+package com.android.intentresolver.platform
 
 import android.content.Context
 import android.content.pm.UserInfo
@@ -11,12 +11,12 @@ import android.os.UserHandle
 import android.os.UserManager
 import androidx.annotation.NonNull
 import com.android.intentresolver.THROWS_EXCEPTION
+import com.android.intentresolver.data.repository.AvailabilityChange
+import com.android.intentresolver.data.repository.ProfileAdded
+import com.android.intentresolver.data.repository.ProfileRemoved
+import com.android.intentresolver.data.repository.UserEvent
 import com.android.intentresolver.mock
-import com.android.intentresolver.v2.data.repository.AvailabilityChange
-import com.android.intentresolver.v2.data.repository.ProfileAdded
-import com.android.intentresolver.v2.data.repository.ProfileRemoved
-import com.android.intentresolver.v2.data.repository.UserEvent
-import com.android.intentresolver.v2.platform.FakeUserManager.State
+import com.android.intentresolver.platform.FakeUserManager.State
 import com.android.intentresolver.whenever
 import kotlin.random.Random
 import kotlinx.coroutines.channels.Channel
diff --git a/tests/shared/src/com/android/intentresolver/v2/data/model/FakeChooserRequest.kt b/tests/shared/src/com/android/intentresolver/v2/data/model/FakeChooserRequest.kt
deleted file mode 100644
index e697a13d..00000000
--- a/tests/shared/src/com/android/intentresolver/v2/data/model/FakeChooserRequest.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.intentresolver.v2.data.model
-
-import android.content.Intent
-import android.net.Uri
-
-fun fakeChooserRequest(
-    intent: Intent = Intent(),
-    packageName: String = "pkg",
-    referrer: Uri? = null,
-) = ChooserRequest(intent, packageName, referrer)