diff options
9 files changed, 10 insertions, 15 deletions
diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java index 41233a23e..00ec67569 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java +++ b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java @@ -18,7 +18,6 @@ package com.android.role.controller.util; import android.content.Context; import android.os.Build; -import android.os.Flags; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; @@ -91,7 +90,7 @@ public final class UserUtils { * allowed from Android V+ only, so this method will return false on Sdk levels below that. */ public static boolean isPrivateProfile(@NonNull UserHandle user, @NonNull Context context) { - if (!SdkLevel.isAtLeastV() || !Flags.allowPrivateProfile()) { + if (!SdkLevel.isAtLeastV()) { return false; } Context userContext = getUserContext(context, user); diff --git a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java index 4d778befb..10e8dd0e1 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java @@ -139,7 +139,7 @@ public class UserUtils { */ private static boolean isPrivateProfile(@NonNull UserHandle userHandle, @NonNull Context context) { - if (!SdkLevel.isAtLeastV() || !android.os.Flags.allowPrivateProfile()) { + if (!SdkLevel.isAtLeastV()) { return false; } Context userContext = context.createContextAsUser(userHandle, /* flags= */ 0); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt index 8d7d96f99..307ef9cf6 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt @@ -331,9 +331,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { get() = SafetyCenterIds.entryIdFromString(id) private fun isPrivateProfileSupported(): Boolean { - return SdkLevel.isAtLeastV() && - com.android.permission.flags.Flags.privateProfileSupported() && - android.os.Flags.allowPrivateProfile() + return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported() } companion object { diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt index b89abde13..551f676f1 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt @@ -49,7 +49,7 @@ class SafetySubpageEntryPreference( context: Context, private val launchTaskId: Int?, private val entry: SafetyCenterEntry, - private val viewModel: SafetyCenterViewModel + private val viewModel: SafetyCenterViewModel, ) : TwoTargetPreference(context), ComparablePreference { init { @@ -108,9 +108,7 @@ class SafetySubpageEntryPreference( } private fun isPrivateProfileSupported(): Boolean { - return SdkLevel.isAtLeastV() && - com.android.permission.flags.Flags.privateProfileSupported() && - android.os.Flags.allowPrivateProfile() + return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported() } override fun onBindViewHolder(holder: PreferenceViewHolder) { @@ -125,7 +123,7 @@ class SafetySubpageEntryPreference( PendingIntentSender.send(iconAction.pendingIntent, launchTaskId) viewModel.interactionLogger.recordForEntry( Action.ENTRY_ICON_ACTION_CLICKED, - entry + entry, ) } catch (ex: Exception) { Log.e(TAG, "Failed to execute icon action intent for $entry", ex) diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java index 87d8744a8..0da8286f6 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java @@ -98,8 +98,7 @@ public class StaticSafetyEntryPreference extends Preference implements Comparabl private Boolean isPrivateProfileSupported() { return SdkLevel.isAtLeastV() - && com.android.permission.flags.Flags.privateProfileSupported() - && android.os.Flags.allowPrivateProfile(); + && com.android.permission.flags.Flags.privateProfileSupported(); } @Override diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt index 23074a06f..57fdbca03 100644 --- a/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt @@ -205,7 +205,7 @@ fun Chip( color = secondaryTextColor, overflow = TextOverflow.Ellipsis, maxLines = secondaryLabelMaxLines ?: 1, - style = MaterialTheme.typography.caption2, + style = MaterialTheme.typography.caption2.copy(hyphens = Hyphens.Auto), ) } } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt index 5f1c8dd2c..320e58964 100644 --- a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt @@ -123,6 +123,7 @@ internal fun WearPermissionButtonInternal( text = secondaryLabel, modifier = Modifier.fillMaxWidth(), maxLines = secondaryLabelMaxLines ?: LocalTextConfiguration.current.maxLines, + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } } diff --git a/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml b/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml index cb6323fff..4e1865697 100644 --- a/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml +++ b/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml @@ -67,6 +67,7 @@ titleForWork="@com.android.safetycenter.resources:string/biometrics_title_for_work" titleForPrivateProfile="@com.android.safetycenter.resources:string/biometrics_title_for_private_profile" searchTerms="@com.android.safetycenter.resources:string/biometrics_search_terms" + refreshOnPageOpenAllowed="true" initialDisplayState="hidden"/> </safety-sources-group> <safety-sources-group diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java index 3bc3ff12b..e15614be2 100644 --- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java +++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java @@ -878,7 +878,6 @@ public class RoleManagerTest { } @Test - @RequiresFlagsEnabled(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE) @EnsureHasPrivateProfile(installInstrumentedApp = OptionalBoolean.TRUE) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = "VanillaIceCream") |