From ba5e25e3b1affd081295d59017400dac7173a61f Mon Sep 17 00:00:00 2001 From: Pasty Chang Date: Thu, 25 Feb 2021 08:05:07 +0000 Subject: [PATCH] Set ConfirmDeviceCredentialActivity non-external in FRP FRP ConfirmDeviceCredentialActivity launched in initial setup flow should belong to internal flow, so it needs to set the external flag to false. It can transmit setup intent extra to the stencil library to make the screen be applied to the stencil and BC layout. Bug: 171950236 Test: Manual test & RunSettingsGoogleRoboTests Change-Id: Ia98d1bb4fc3a1687992b202b1e58afc1463efaf4 --- .../settings/password/ConfirmDeviceCredentialActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 6a97dcd1b45..14b364c8d12 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java @@ -228,7 +228,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { launchedCDC = builder.setHeader(mTitle) // Show the title in the header location .setDescription(mDetails) .setAlternateButton(alternateButton) - .setExternal(true) + .setExternal(false) .setUserId(LockPatternUtils.USER_FRP) .show(); } else if (isManagedProfile && isInternalActivity()