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

Commit 1b89dd02 authored by Hao Dong's avatar Hao Dong
Browse files

[CDCA] Set real caller for work lock activity 

BiometricPrompt internally relies on caller's package name for defaut
logo information. ConfirmDeviceCredentialActivity then needs to set
the real caller to getCallingActivity().

However, when WorkLockActivity uses CDCA, the real caller should not be
itself, instead, it should be EXTRA_PACKAGE_NAME. This CL passes
this extra to CDCA.

Test: manual test with work account
Flag: EXEMPT bug fix
Bug: 378036094

Change-Id: I417857d307dac136372150d39dde8519ca7c17f4
parent a808c906

packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ public class WorkLockActivity extends Activity { 
            confirmCredentialIntent.putExtra(Intent.EXTRA_INTENT, target.getIntentSender());

        }



        String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);

        confirmCredentialIntent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);



        // WorkLockActivity is started as a task overlay, so unless credential confirmation is also

        // started as an overlay, it won't be visible.

        final ActivityOptions launchOptions = ActivityOptions.makeBasic();