summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author mrenouf <mrenouf@google.com> 2024-03-11 10:07:46 -0400
committer Mark Renouf <mrenouf@google.com> 2024-03-12 17:00:34 +0000
commite7e3f788b64f5b33ffde5df8471c9d82565c8a95 (patch)
treef4891138c33fef99eb9bbd5095822c5602e50340 /java/src
parent01d9014ba14b33f76c09bd1901224f7e674eefff (diff)
UserScopedService: Cache and share contexts
This change caches both the Context and the Service instance to reuse both as needed. Previously a new Context is created for every service for a given user. In addition, switch to LruCache instead of a plain main, which provides an upper bound on the number of cached instances as a safeguard. Finally, switch the key to UserHandle to decouple from other sharesheet concepts. This mechanism is an implementation detail and not for general use so framework types are fine here. Bug: 324428064 Test: Not yet used Flag: Not yet used Change-Id: I0115853f0c8888d59ebb0407391a1e6d3c6e7e6c
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/inject/SystemServices.kt7
-rw-r--r--java/src/com/android/intentresolver/v2/data/repository/UserScopedService.kt72
2 files changed, 68 insertions, 11 deletions
diff --git a/java/src/com/android/intentresolver/inject/SystemServices.kt b/java/src/com/android/intentresolver/inject/SystemServices.kt
index 4762f4a1..069c926c 100644
--- a/java/src/com/android/intentresolver/inject/SystemServices.kt
+++ b/java/src/com/android/intentresolver/inject/SystemServices.kt
@@ -26,6 +26,9 @@ import android.content.pm.ShortcutManager
import android.os.UserManager
import android.view.WindowManager
import androidx.core.content.getSystemService
+import com.android.intentresolver.v2.data.repository.UserScopedContext
+import com.android.intentresolver.v2.data.repository.UserScopedService
+import com.android.intentresolver.v2.data.repository.UserScopedServiceImpl
import dagger.Binds
import dagger.Module
import dagger.Provides
@@ -99,6 +102,10 @@ class ShortcutManagerModule {
class UserManagerModule {
@Provides
fun userManager(@ApplicationContext ctx: Context): UserManager = ctx.requireSystemService()
+
+ @Provides fun scopedUserManager(ctx: UserScopedContext): UserScopedService<UserManager> {
+ return UserScopedServiceImpl(ctx, UserManager::class)
+ }
}
@Module
diff --git a/java/src/com/android/intentresolver/v2/data/repository/UserScopedService.kt b/java/src/com/android/intentresolver/v2/data/repository/UserScopedService.kt
index 3553744a..07903a7b 100644
--- a/java/src/com/android/intentresolver/v2/data/repository/UserScopedService.kt
+++ b/java/src/com/android/intentresolver/v2/data/repository/UserScopedService.kt
@@ -1,8 +1,27 @@
+/*
+ * 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.repository
import android.content.Context
+import android.os.UserHandle
+import android.util.LruCache
import androidx.core.content.getSystemService
-import com.android.intentresolver.v2.shared.model.User
+import javax.inject.Inject
+import kotlin.reflect.KClass
/**
* Provides cached instances of a [system service][Context.getSystemService] created with
@@ -27,20 +46,51 @@ import com.android.intentresolver.v2.shared.model.User
* ```
*/
interface UserScopedService<T> {
- fun forUser(user: User): T
+ fun forUser(user: UserHandle): T
}
-inline fun <reified T> userScopedService(context: Context): UserScopedService<T> {
- return object : UserScopedService<T> {
- private val map = mutableMapOf<User, T>()
+/**
+ * Provides cached Context instances each distinct per-User.
+ *
+ * @see [UserScopedService]
+ */
+class UserScopedContext @Inject constructor(private val applicationContext: Context) {
+ private val contextCacheSizeLimit = 8
+
+ private val instances =
+ object : LruCache<UserHandle, Context>(contextCacheSizeLimit) {
+ override fun create(key: UserHandle): Context {
+ return applicationContext.createContextAsUser(key, 0)
+ }
+ }
- override fun forUser(user: User): T {
- return synchronized(this) {
- map.getOrPut(user) {
- val userContext = context.createContextAsUser(user.handle, 0)
- requireNotNull(userContext.getSystemService())
- }
+ fun forUser(user: UserHandle): Context {
+ synchronized(this) {
+ return if (applicationContext.user == user) {
+ applicationContext
+ } else {
+ return instances[user]
}
}
}
}
+
+/** Returns a cache of service instances, distinct by user */
+class UserScopedServiceImpl<T : Any>(
+ contexts: UserScopedContext,
+ serviceType: KClass<T>
+): UserScopedService<T> {
+ private val instances =
+ object : LruCache<UserHandle, T>(8) {
+ override fun create(key: UserHandle): T {
+ val context = contexts.forUser(key)
+ return requireNotNull(context.getSystemService(serviceType.java))
+ }
+ }
+
+ override fun forUser(user: UserHandle): T {
+ synchronized(this) {
+ return instances[user]
+ }
+ }
+}