Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Safer intents] App Time Spent Preference

Browse Source 
Set package com.android.internal.R.string.config_systemWellbeing to the
intent.

Fix: 356117796
Flag: EXEMPT bug fix
Test: manual - on App info
Test: atest AppTimeSpentPreferenceTest
Change-Id: I2af7b53a75fe5c6915dd9781406039822789c18c
Merged-In: I2af7b53a75fe5c6915dd9781406039822789c18c
This commit is contained in:
Chaohui Wang
2024-08-29 13:17:36 +08:00
parent b75fa80578
commit e401ea4743
2 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/com/android/settings/spa/app/appinfo/AppTimeSpentPreference.kt
View File

@@ -19,14 +19,16 @@ package com.android.settings.spa.app.appinfo
import android.content.Context
import android.content.Intent
import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager.ResolveInfoFlags
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.provider.Settings
import androidx.compose.runtime.Composable
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.liveData
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R
import com.android.settings.overlay.FeatureFactory
import com.android.settingslib.spa.framework.compose.stateOf
@@ -36,44 +38,61 @@ import com.android.settingslib.spaprivileged.model.app.hasFlag
import com.android.settingslib.spaprivileged.model.app.userHandle
import com.android.settingslib.spaprivileged.model.app.userId
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
fun AppTimeSpentPreference(app: ApplicationInfo) {
val context = LocalContext.current
val presenter = remember { AppTimeSpentPresenter(context, app) }
if (!presenter.isAvailable()) return
val presenter = remember(app) { AppTimeSpentPresenter(context, app) }
val isAvailable by presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false)
if (!isAvailable) return
Preference(object : PreferenceModel {
override val title = stringResource(R.string.time_spent_in_app_pref_title)
override val summary = presenter.summaryLiveData.observeAsState(
initial = stringResource(R.string.summary_placeholder),
)
override val enabled = stateOf(presenter.isEnabled())
override val onClick = presenter::startActivity
})
val summary = presenter.summaryFlow.collectAsStateWithLifecycle(
initialValue = stringResource(R.string.summary_placeholder),
)
Preference(
object : PreferenceModel {
override val title = stringResource(R.string.time_spent_in_app_pref_title)
override val summary = summary
override val enabled = stateOf(presenter.isEnabled())
override val onClick = presenter::startActivity
}
)
}
private class AppTimeSpentPresenter(
private val context: Context,
private val app: ApplicationInfo,
) {
private val intent = Intent(Settings.ACTION_APP_USAGE_SETTINGS).apply {
putExtra(Intent.EXTRA_PACKAGE_NAME, app.packageName)
}
private val intent =
Intent(Settings.ACTION_APP_USAGE_SETTINGS).apply {
// Limit the package for safer intents, since string resource is not null,
// we restrict the target to this single package.
setPackage(context.getString(com.android.internal.R.string.config_systemWellbeing))
putExtra(Intent.EXTRA_PACKAGE_NAME, app.packageName)
}
private val appFeatureProvider = FeatureFactory.getFactory(context)
.getApplicationFeatureProvider(context)
fun isAvailable() = context.packageManager.queryIntentActivitiesAsUser(
intent, ResolveInfoFlags.of(0), app.userId
).any { resolveInfo ->
resolveInfo?.activityInfo?.applicationInfo?.isSystemApp == true
}
val isAvailableFlow = flow { emit(resolveIntent() != null) }.flowOn(Dispatchers.Default)
// Resolve the intent first with PackageManager.MATCH_SYSTEM_ONLY flag to ensure that
// only system apps are resolved.
private fun resolveIntent(): ResolveInfo? =
context.packageManager.resolveActivityAsUser(
intent,
PackageManager.MATCH_SYSTEM_ONLY,
app.userId,
)
fun isEnabled() = app.hasFlag(ApplicationInfo.FLAG_INSTALLED)
val summaryLiveData = liveData(Dispatchers.IO) {
emit(appFeatureProvider.getTimeSpentInApp(app.packageName).toString())
}
val summaryFlow =
flow { emit(appFeatureProvider.getTimeSpentInApp(app.packageName).toString()) }
.flowOn(Dispatchers.Default)
fun startActivity() {
context.startActivityAsUser(intent, app.userHandle)