Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b1aa170 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11465908 from faba808e to 24Q2-release

Change-Id: I2665d9b406a9c13af2d985a8002dfbe9652fad45
parents 95677682 faba808e
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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))