diff options
2 files changed, 15 insertions, 10 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java index 425375d7a..149bc4efc 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java @@ -39,8 +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_REVIEW_REQUIRED; -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; @@ -83,7 +81,6 @@ import android.health.connect.HealthConnectManager; import android.health.connect.HealthPermissions; import android.os.Binder; import android.os.Build; -import android.os.Build.VERSION_CODES; import android.os.Parcelable; import android.os.UserHandle; import android.os.UserManager; @@ -118,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; @@ -1072,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. */ diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt index 35543b6f1..4d94d8c1c 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt @@ -114,24 +114,23 @@ object AdminRestrictedPermissionsUtilsTest { @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) fun addAdminRestrictedPermission_addsPermissionToRestrictedList() { + val exampleHealthPermission = "test.permission.health" var canGrant = AdminRestrictedPermissionsUtils.mayAdminGrantPermission( - HealthPermissions.READ_HEART_RATE, - HealthPermissions.HEALTH_PERMISSION_GROUP, + exampleHealthPermission, + /* group= */ null, /* canAdminGrantSensorsPermissions= */ false, /* isManagedProfile= */ false, dpm, ) assertEquals(true, canGrant) - AdminRestrictedPermissionsUtils.addAdminRestrictedPermission( - HealthPermissions.READ_HEART_RATE - ) + AdminRestrictedPermissionsUtils.addAdminRestrictedPermission(exampleHealthPermission) canGrant = AdminRestrictedPermissionsUtils.mayAdminGrantPermission( - HealthPermissions.READ_HEART_RATE, - HealthPermissions.HEALTH_PERMISSION_GROUP, + exampleHealthPermission, + /* group= */ null, /* canAdminGrantSensorsPermissions= */ false, /* isManagedProfile= */ false, dpm, |