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

Snap for 11465908 from faba808e5e to 24Q2-release

Browse Source 
Change-Id: I2665d9b406a9c13af2d985a8002dfbe9652fad45
This commit is contained in:
Android Build Coastguard Worker
2024-02-17 22:21:10 +00:00
parent 9567768251 faba808e5e
commit 5b1aa17084
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/BiometricFragment.java
View File

@@ -21,6 +21,7 @@ import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
import android.hardware.biometrics.PromptInfo;
import android.multiuser.Flags;
import android.os.Bundle;
import android.os.CancellationSignal;
@@ -140,8 +141,14 @@ public class BiometricFragment extends InstrumentedFragment {
.setDisallowBiometricsIfPolicyExists(
promptInfo.isDisallowBiometricsIfPolicyExists())
.setShowEmergencyCallButton(promptInfo.isShowEmergencyCallButton())
.setReceiveSystemEvents(true)
.setAllowBackgroundAuthentication(true);
.setReceiveSystemEvents(true);
if (Flags.enableBiometricsToUnlockPrivateSpace()) {
promptBuilder = promptBuilder.setAllowBackgroundAuthentication(true /* allow */,
promptInfo.shouldUseParentProfileForDeviceCredential());
} else {
promptBuilder = promptBuilder.setAllowBackgroundAuthentication(true /* allow */);
}
// Check if the default subtitle should be used if subtitle is null/empty
if (promptInfo.isUseDefaultSubtitle()) {

1
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -311,6 +311,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
mForceVerifyPath = userProperties.isCredentialShareableWithParent();
if (android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
&& isBiometricAllowed(effectiveUserId, mUserId)) {
promptInfo.setUseParentProfileForDeviceCredential(true);
showBiometricPrompt(promptInfo, effectiveUserId);
launchedBiometric = true;
} else {

5
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppButtonsTest.kt
View File

@@ -24,6 +24,7 @@ import android.content.pm.Flags
import android.content.pm.PackageInfo
import android.content.pm.PackageInstaller
import android.content.pm.PackageManager
import android.platform.test.flag.junit.SetFlagsRule
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.assertIsNotDisplayed
@@ -34,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
import com.android.settings.R
import com.android.settings.flags.Flags as SettingsFlags
import com.android.settingslib.applications.AppUtils
import com.android.settingslib.spa.testutils.delay
import kotlinx.coroutines.flow.MutableStateFlow
@@ -54,6 +56,8 @@ class AppButtonsTest {
@get:Rule
val composeTestRule = createComposeRule()
@get:Rule val setFlagsRule: SetFlagsRule = SetFlagsRule()
private lateinit var mockSession: MockitoSession
@Spy
@@ -113,6 +117,7 @@ class AppButtonsTest {
fun launchButton_displayed_archivingDisabled() {
whenever(packageManager.getLaunchIntentForPackage(PACKAGE_NAME)).thenReturn(Intent())
featureFlags.setFlag(Flags.FLAG_ARCHIVING, false)
setFlagsRule.disableFlags(SettingsFlags.FLAG_APP_ARCHIVING)
setContent()
composeTestRule.onNodeWithText(context.getString(R.string.launch_instant_app))