diff options
author | 2025-03-21 20:23:11 -0700 | |
---|---|---|
committer | 2025-03-21 20:23:11 -0700 | |
commit | 2af72695f264f8c36e0cb1289df079afecd63984 (patch) | |
tree | 12a2bb742313f2dfa436d0e53526e6ed0c8c67bd /PermissionController/src | |
parent | afba1bb6158e91e1323c8a1c7370413ad4516b37 (diff) | |
parent | 0ee3e3832d76927465e054cc4716b72033cea0ec (diff) |
Snap for 13256841 from 0ee3e3832d76927465e054cc4716b72033cea0ec to 25Q2-release
Change-Id: I4fdc2a3bd4b5bb5896176a091e76925c2ce972bf
Diffstat (limited to 'PermissionController/src')
2 files changed, 45 insertions, 50 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt index 2933d6fda..38a3b44e9 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt @@ -44,6 +44,7 @@ import com.android.permissioncontroller.permission.ui.wear.model.WearAppPermissi import com.android.permissioncontroller.permission.ui.wear.model.WearLocationProviderInterceptDialogViewModel import com.android.permissioncontroller.permission.utils.ArrayUtils import com.android.permissioncontroller.permission.utils.LocationUtils +import com.android.permissioncontroller.permission.utils.PermissionMapping import com.android.permissioncontroller.permission.utils.Utils import com.android.permissioncontroller.permission.utils.legacy.LegacySafetyNetLogger import com.android.permissioncontroller.permission.utils.navigateSafe @@ -59,7 +60,7 @@ class WearAppPermissionGroupsHelper( val wearViewModel: WearAppPermissionUsagesViewModel, val revokeDialogViewModel: AppPermissionGroupsRevokeDialogViewModel, val locationProviderInterceptDialogViewModel: WearLocationProviderInterceptDialogViewModel, - private val toggledGroups: ArraySet<AppPermissionGroup> = ArraySet() + private val toggledGroups: ArraySet<AppPermissionGroup> = ArraySet(), ) { fun getPermissionGroupChipParams( appPermissionUsages: List<AppPermissionUsage> @@ -71,7 +72,7 @@ class WearAppPermissionGroupsHelper( viewModel.extractGroupUsageLastAccessTime( groupUsageLastAccessTime, appPermissionUsages, - packageName + packageName, ) val groupUiInfos = viewModel.packagePermGroupsLiveData.value val groups: List<AppPermissionGroup> = appPermissions.permissionGroups @@ -92,7 +93,7 @@ class WearAppPermissionGroupsHelper( groups .filter { Utils.shouldShowPermission(context, it) } - .partition { it.declaringPackage == Utils.OS_PKG } + .partition { PermissionMapping.isPlatformPermissionGroup(it.name) } .let { it.first.plus(it.second) } .forEach { group -> if (Utils.areGroupPermissionsIndividuallyControlled(context, group.name)) { @@ -107,7 +108,7 @@ class WearAppPermissionGroupsHelper( checked = group.areRuntimePermissionsGranted(arrayOf(perm.name)), onCheckedChanged = { checked -> run { onPermissionGrantedStateChanged(group, perm, checked) } - } + }, ) ) } @@ -123,10 +124,10 @@ class WearAppPermissionGroupsHelper( getSummary( category, it, - groupUsageLastAccessTime[it.groupName] + groupUsageLastAccessTime[it.groupName], ) }, - onClick = { onPermissionGroupClicked(group, category.categoryName) } + onClick = { onPermissionGroupClicked(group, category.categoryName) }, ) ) } @@ -138,7 +139,7 @@ class WearAppPermissionGroupsHelper( private fun getSummary( category: Category?, groupUiInfo: GroupUiInfo, - lastAccessTime: Long? + lastAccessTime: Long?, ): String { val grantSummary = getGrantSummary(category, groupUiInfo)?.let { context.getString(it) } ?: "" @@ -196,7 +197,7 @@ class WearAppPermissionGroupsHelper( private fun onPermissionGrantedStateChanged( group: AppPermissionGroup, perm: PermissionInfo, - checked: Boolean + checked: Boolean, ) { if (checked) { group.grantRuntimePermissions(true, false, arrayOf(perm.name)) @@ -247,7 +248,7 @@ class WearAppPermissionGroupsHelper( revokeDialogViewModel.hasConfirmedRevoke = true } revokeDialogViewModel.dismissDialog() - } + }, ) } else { revokePermissionInGroup(group, perm.name) @@ -261,7 +262,7 @@ class WearAppPermissionGroupsHelper( if ("user" == Build.TYPE) { Log.e( TAG, - "The impossible happens, permission $permName is not in group $group.name." + "The impossible happens, permission $permName is not in group $group.name.", ) null } else { @@ -291,13 +292,13 @@ class WearAppPermissionGroupsHelper( private fun showRevocationWarningDialog( messageId: Int, onOkButtonClick: () -> Unit, - onCancelButtonClick: () -> Unit = { revokeDialogViewModel.dismissDialog() } + onCancelButtonClick: () -> Unit = { revokeDialogViewModel.dismissDialog() }, ) { revokeDialogViewModel.revokeDialogArgs = RevokeDialogArgs( messageId = messageId, onOkButtonClick = onOkButtonClick, - onCancelButtonClick = onCancelButtonClick + onCancelButtonClick = onCancelButtonClick, ) revokeDialogViewModel.showDialogLiveData.value = true } @@ -315,13 +316,15 @@ class WearAppPermissionGroupsHelper( LocationUtils.isLocationGroupAndControllerExtraPackage( context, permGroupName, - packageName + packageName, ) ) { // Redirect to location controller extra package settings. LocationUtils.startLocationControllerExtraPackageSettings(context, user) - } else if (permGroupName.equals(HEALTH_PERMISSION_GROUP) - && android.permission.flags.Flags.replaceBodySensorPermissionEnabled()) { + } else if ( + permGroupName.equals(HEALTH_PERMISSION_GROUP) && + android.permission.flags.Flags.replaceBodySensorPermissionEnabled() + ) { // Redirect to Health&Fitness UI Utils.navigateToAppHealthConnectSettings(fragment.requireContext(), packageName, user) } else { @@ -333,7 +336,7 @@ class WearAppPermissionGroupsHelper( user, caller, sessionId, - grantCategory + grantCategory, ) fragment.findNavController().navigateSafe(R.id.perm_groups_to_app, args) } @@ -364,7 +367,7 @@ class WearAppPermissionGroupsHelper( viewModel.setAutoRevoke(checked) Log.w(TAG, "setAutoRevoke $checked") } - } + }, ) } @@ -382,12 +385,12 @@ data class PermissionGroupChipParam( val enabled: Boolean = true, val checked: Boolean? = null, val onClick: () -> Unit = {}, - val onCheckedChanged: (Boolean) -> Unit = {} + val onCheckedChanged: (Boolean) -> Unit = {}, ) data class AutoRevokeChipParam( val labelRes: Int, val visible: Boolean, val checked: Boolean = false, - val onCheckedChanged: (Boolean) -> Unit + val onCheckedChanged: (Boolean) -> Unit, ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java index 93e5abc70..149bc4efc 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java @@ -39,7 +39,6 @@ import static android.content.Intent.EXTRA_REASON; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT; -import static android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_WHEN_REQUESTED; import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED; import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED; import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY; @@ -116,6 +115,7 @@ import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.model.AppPermissionGroup; import com.android.permissioncontroller.permission.model.livedatatypes.LightAppPermGroup; import com.android.permissioncontroller.permission.model.livedatatypes.LightPackageInfo; +import com.android.settingslib.widget.SettingsThemeHelper; import kotlin.Triple; @@ -1070,6 +1070,14 @@ public final class Utils { } /** + * Whether Expressive Design is enabled on this device. + */ + public static boolean isExpressiveDesignEnabled(@NonNull Context context) { + return SdkLevel.isAtLeastB() && DeviceUtils.isHandheld() + && SettingsThemeHelper.isExpressiveTheme(context); + } + + /** * Returns true if the group name passed is that of the Platform health group. * @param permGroupName name of the group that needs to be checked. */ @@ -1184,45 +1192,29 @@ public final class Utils { } } - // Split permission only applies to READ_HEART_RATE. - if (!requestedHealthPermissions.contains(HealthPermissions.READ_HEART_RATE)) { - return false; - } - - // If there are other health permissions (other than READ_HEALTH_DATA_IN_BACKGROUND) - // don't consider this a pure split-permission request. - if (requestedHealthPermissions.size() > 2) { - return false; - } - - boolean isBackgroundPermissionRequested = - requestedHealthPermissions.contains( - HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND); - // If there are two health permissions declared, make sure the other is - // READ_HEALTH_DATA_IN_BACKGROUND. - if (requestedHealthPermissions.size() == 2 && !isBackgroundPermissionRequested) { + if (!isValidSplitHealthPermissions(requestedHealthPermissions)) { return false; } - // If READ_HEALTH_DATA_IN_BACKGROUND is requested, check permission flag to see if is from - // split permission. - if (isBackgroundPermissionRequested) { - int readHealthDataInBackgroundFlag = - pm.getPermissionFlags( - HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND, packageName, user); - if (!isFromSplitPermission(readHealthDataInBackgroundFlag)) { + int targetSdk = packageInfo.getTargetSdkVersion(); + for (String perm : requestedHealthPermissions) { + if (!isFromSplitPermission(pm.getPermissionFlags(perm, packageName, user), targetSdk)) { return false; } } + return true; + } - // Check READ_HEART_RATE permission flag to see if is from split permission. - int readHeartRateFlag = - pm.getPermissionFlags(HealthPermissions.READ_HEART_RATE, packageName, user); - return isFromSplitPermission(readHeartRateFlag); + private static boolean isValidSplitHealthPermissions(List<String> permissions) { + return (permissions.size() == 1 && permissions.contains(HealthPermissions.READ_HEART_RATE)) + || (permissions.size() == 2 && permissions.contains(HealthPermissions.READ_HEART_RATE) + && permissions.contains(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND)); } - private static boolean isFromSplitPermission(int permissionFlag) { - return (permissionFlag & FLAG_PERMISSION_REVOKE_WHEN_REQUESTED) != 0; + private static boolean isFromSplitPermission(int permissionFlag, int targetSdk) { + return (targetSdk >= Build.VERSION_CODES.M) + ? (permissionFlag & PackageManager.FLAG_PERMISSION_REVOKE_WHEN_REQUESTED) != 0 + : (permissionFlag & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0; } /** |