PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support App details for work profile apps" into main

Browse Source
This commit is contained in:
Yanting Yang
2023-08-02 20:12:32 +00:00
committed by Android (Google) Code Review
parent a75824cf37 6b02225810
commit f5e74b8f49
4 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo;
import android.content.Context;
import android.content.Intent;
import android.os.UserManager;
import androidx.preference.Preference;
@@ -39,10 +38,6 @@ public class AppInstallerInfoPreferenceController extends AppInfoPreferenceContr
@Override
public int getAvailabilityStatus() {
if (UserManager.get(mContext).isManagedProfile()) {
return DISABLED_FOR_USER;
}
if (AppUtils.isMainlineModule(mContext.getPackageManager(), mPackageName)) {
return DISABLED_FOR_USER;
}

8
src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreference.kt
View File

@@ -32,9 +32,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spaprivileged.framework.common.asUser
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.android.settingslib.spaprivileged.model.app.userHandle
import com.android.settingslib.spaprivileged.model.app.userId
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
@@ -71,7 +69,6 @@ private class AppInstallerInfoPresenter(
) {
private val userContext = context.asUser(app.userHandle)
private val packageManager = userContext.packageManager
private val userManager = context.userManager
private val installerPackageFlow = flow {
emit(withContext(Dispatchers.IO) {
@@ -88,9 +85,8 @@ private class AppInstallerInfoPresenter(
val isAvailableFlow = installerLabelFlow.map { installerLabel ->
withContext(Dispatchers.IO) {
!userManager.isManagedProfile(app.userId) &&
!AppUtils.isMainlineModule(packageManager, app.packageName) &&
installerLabel != null
!AppUtils.isMainlineModule(packageManager, app.packageName) &&
installerLabel != null
}
}